diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2003-04-27 15:16:11 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2003-04-27 15:16:11 +0000 |
| commit | b0c8377277794e9850291f21bb4ecb716b8e0caa (patch) | |
| tree | 2f413656784ce04f2798b86e5a2192fdfcd90446 | |
| parent | 08154dad5e53c4894dc391d47e1bc4642e94e39b (diff) | |
| download | xine-lib-b0c8377277794e9850291f21bb4ecb716b8e0caa.tar.gz xine-lib-b0c8377277794e9850291f21bb4ecb716b8e0caa.tar.bz2 | |
Prevent mjpeg files created by canon digital cameras from being misdetected as having been created by avid.
CVS patchset: 4697
CVS date: 2003/04/27 15:16:11
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/mjpeg.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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); |