summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--src/libffmpeg/libavcodec/mjpeg.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 84e3ae271..7548e021b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ xine-lib (1-beta11)
* mms protocols (mmst + mmsh ) bugfixes
* new input plugin api
* Quicktime fixes (now all Matrix: Reloaded teasers and trailers play)
+ * fix playback of video files created by Canon digital cameras
xine-lib (1-beta10)
* loading and displaying png images (e.g. for logos)
diff --git a/src/libffmpeg/libavcodec/mjpeg.c b/src/libffmpeg/libavcodec/mjpeg.c
index 135066796..5f1271abf 100644
--- a/src/libffmpeg/libavcodec/mjpeg.c
+++ b/src/libffmpeg/libavcodec/mjpeg.c
@@ -1160,7 +1160,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
4bytes field_size
4bytes field_size_less_padding
*/
- s->buggy_avid = 1;
+// s->buggy_avid = 1;
// if (s->first_picture)
// printf("mjpeg: workarounding buggy AVID\n");
s->interlace_polarity = get_bits(&s->gb, 8);