From 1fa4018e29d7701d06a27596b9b15a185193707b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 3 Sep 2012 23:39:50 +0200 Subject: [PATCH] jpegdec: try to fix different flipping behavior of inteljpegs. This may need some trial and error to find exactly how to identify them so please report any intel jpegs that get fliped wrong. Fixes Ticket511 Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index c6297c3b43..9f81302a3c 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1468,7 +1468,7 @@ static int mjpeg_decode_com(MJpegDecodeContext *s) // printf("mjpeg: workarounding buggy AVID\n"); } else if (!strcmp(cbuf, "CS=ITU601")) s->cs_itu601 = 1; - else if ((len > 20 && !strncmp(cbuf, "Intel(R) JPEG Library", 21)) || + else if ((len > 31 && !strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32)) || (len > 19 && !strncmp(cbuf, "Metasoft MJPEG Codec", 20))) s->flipped = 1;