diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2003-05-23 18:31:07 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2003-05-23 18:31:07 +0000 |
| commit | 31b38647a9e1221c5063966e5c5e5d015ca9bf91 (patch) | |
| tree | 2afb13af1d6867e5fd85de25031ee9cc2bff7da6 /src | |
| parent | 37893fe6dd9998be3fdb05c8e070628b2ecda2bc (diff) | |
| download | xine-lib-31b38647a9e1221c5063966e5c5e5d015ca9bf91.tar.gz xine-lib-31b38647a9e1221c5063966e5c5e5d015ca9bf91.tar.bz2 | |
add change that allows canon digital camera created avis to play correctly
CVS patchset: 4911
CVS date: 2003/05/23 18:31:07
Diffstat (limited to 'src')
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 16 |
1 files changed, 16 insertions, 0 deletions
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); |