diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 17:57:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 20:31:04 +0100 |
| commit | af3d003658e5c9e3e154b29cbf9760c32e7ac6ed (patch) | |
| tree | 9bf432aebc62cb7e53137a51560df222d37d3ec7 | |
| parent | c00beff5e0754706cdeec25084f4893a8bc39a5b (diff) | |
| download | ffmpeg-af3d003658e5c9e3e154b29cbf9760c32e7ac6ed.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>
(cherry picked from commit 98f9aa389b2de69118cd599235b2208b3c311c4c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 a3e258b24a..bcd72e2ffb 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) |