summaryrefslogtreecommitdiff
path: root/v4l/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/ChangeLog')
-rw-r--r--v4l/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 6db1f2234..120ea02ec 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-13 04:08 Hartmut Hackmann
+ * saa7134-tvaudio.c saa7134-ossc
+ - corrected off by 1 error in DMA memory allocation
+ - corrected oss sound routing for saa7134 and saa7133
+
2005-06-13 19:57 nshmyrev
* bttvp.h:
@@ -36,6 +41,7 @@
- Updated entry for Avermedia Cardbus E500. Thanks to
Kees Blom <Kees.Blom@cwi.nl>.
+>>>>>>> 1.42
2005-06-12 04:08 mchehab
* audiochip.h, compat.h, cx22702.h, cx88-core.c, cx88-dvb.c,
cx88-i2c.c, cx88-vbi.c, cx88-video.c, dpl3518.c, dpl3518.h,