[FFmpeg-cvslog] avcodec/mjpegdec: switch interlaced_polarity to 0 for PAL AVID

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 19 17:57:59 2014 +0100| [af3d003658e5c9e3e154b29cbf9760c32e7ac6ed] | committer: Michael Niedermayer

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 at gmx.at>
(cherry picked from commit 98f9aa389b2de69118cd599235b2208b3c311c4c)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af3d003658e5c9e3e154b29cbf9760c32e7ac6ed
---

 libavcodec/mjpegdec.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index a3e258b..bcd72e2 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)