diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 17:57:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 18:16:42 +0100 |
| commit | 98f9aa389b2de69118cd599235b2208b3c311c4c (patch) | |
| tree | 18a2a99d41cbaa1846ef7ccad77400ead6742b35 /libavcodec/mjpegdec.c | |
| parent | 1083c479eb6e5bcd5220fdd165cf9312f29a0985 (diff) | |
| download | ffmpeg-98f9aa389b2de69118cd599235b2208b3c311c4c.tar.gz | |
avcodec/mjpegdec: switch interlaced_polarity to 0 for PAL AVID
0 should have been the default, this change should make no difference
but this is needed for the following bugfix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 6485b1e576..bbbe1da94a 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -88,6 +88,8 @@ static void parse_avid(MJpegDecodeContext *s, uint8_t *buf, int len) s->buggy_avid = 1; if (len > 14 && buf[12] == 1) /* 1 - NTSC */ s->interlace_polarity = 1; + if (len > 14 && buf[12] == 2) /* 2 - PAL */ + s->interlace_polarity = 0; } av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) |