mjpegdec: Fix field orderforinterlacedAVDJand AVRN in ntsc mode
authorPiotr Bandurski <ami_stuff@o2.pl>
Sun, 19 May 2013 09:24:41 +0000 (11:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 19 May 2013 16:09:57 +0000 (18:09 +0200)
Fixes ticket1656

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c

index 52168cc..b933a71 100644 (file)
@@ -1501,8 +1501,10 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
                 av_log(s->avctx, AV_LOG_INFO, "comment: '%s'\n", cbuf);
 
             /* buggy avid, it puts EOI only at every 10th frame */
-            if (!strcmp(cbuf, "AVID")) {
+            if (len > 3 && (!strncmp(cbuf, "AVID", 4))) {
                 s->buggy_avid = 1;
+                if (len > 14 && cbuf[12] == 1) /* 1 - NTSC, 2 - PAL */
+                    s->interlace_polarity = 1;
             } else if (!strcmp(cbuf, "CS=ITU601"))
                 s->cs_itu601 = 1;
             else if ((len > 31 && !strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32)) ||