aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpegdec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-12-10 23:06:23 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-12-10 23:06:23 +0000
commitab176fdffb7c696beea17b046804b3e5eb0d8351 (patch)
treee69a6628bb0285dd30fd0ac7b61c82cf53a8bac3 /libavcodec/mjpegdec.c
parentf63e5a741084e2c91a0acb37db7d4a4a2c106c14 (diff)
downloadffmpeg-ab176fdffb7c696beea17b046804b3e5eb0d8351.tar.gz
(Partly) support Metasoft MJPEG Codec, fixes half of issue 1611.
Originally committed as revision 20796 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r--libavcodec/mjpegdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index a1839ac124..86862dbd40 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1182,7 +1182,8 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
else if(!strcmp(cbuf, "CS=ITU601")){
s->cs_itu601= 1;
}
- else if(len > 20 && !strncmp(cbuf, "Intel(R) JPEG Library", 21)){
+ else if((len > 20 && !strncmp(cbuf, "Intel(R) JPEG Library", 21)) ||
+ (len > 19 && !strncmp(cbuf, "Metasoft MJPEG Codec", 20))){
s->flipped = 1;
}