diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-12-10 23:06:23 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-12-10 23:06:23 +0000 |
| commit | ab176fdffb7c696beea17b046804b3e5eb0d8351 (patch) | |
| tree | e69a6628bb0285dd30fd0ac7b61c82cf53a8bac3 | |
| parent | f63e5a741084e2c91a0acb37db7d4a4a2c106c14 (diff) | |
| download | ffmpeg-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
| -rw-r--r-- | libavcodec/mjpegdec.c | 3 | ||||
| -rw-r--r-- | libavformat/riff.c | 1 |
2 files changed, 3 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; } diff --git a/libavformat/riff.c b/libavformat/riff.c index ca9e6ff3d7..e1d0b2e085 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -138,6 +138,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */ { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') }, { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') }, + { CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') }, { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, |