From 31b38647a9e1221c5063966e5c5e5d015ca9bf91 Mon Sep 17 00:00:00 2001 From: James Stembridge Date: Fri, 23 May 2003 18:31:07 +0000 Subject: add change that allows canon digital camera created avis to play correctly CVS patchset: 4911 CVS date: 2003/05/23 18:31:07 --- src/libffmpeg/diff_to_ffmpeg_cvs.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index 23e5e8f2c..c0de1f128 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -706,3 +706,19 @@ diff -u -r1.83 postprocess.c } #endif +Index: libavcodec/mjpeg.c +=================================================================== +RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v +retrieving revision 1.61 +diff -u -r1.61 mjpeg.c +--- libavcodec/mjpeg.c 23 May 2003 16:04:24 -0000 1.61 ++++ libavcodec/mjpeg.c 23 May 2003 18:18:53 -0000 +@@ -1135,7 +1160,7 @@ + 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); -- cgit v1.2.3