[FFmpeg-cvslog] avcodec/mjpegdec: Improve intel jpeg flip heuristic

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  6 01:32:22 2014 +0200| [dae6c199950ffd34e53d1fd2522e212e32bfe667] | committer: Carl Eugen Hoyos

avcodec/mjpegdec: Improve intel jpeg flip heuristic

Fixes Ticket3698

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0545ef7116db1e87894d978bfa400578652c716d)

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

 libavcodec/mjpegdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 2c79da5..b498d0f 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1718,7 +1718,7 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
                 parse_avid(s, cbuf, len);
             } else if (!strcmp(cbuf, "CS=ITU601"))
                 s->cs_itu601 = 1;
-            else if ((!strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32)) ||
+            else if ((!strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32) && s->avctx->codec_tag) ||
                      (!strncmp(cbuf, "Metasoft MJPEG Codec", 20)))
                 s->flipped = 1;