[FFmpeg-cvslog] Support fourcc MMJP.

Carl Eugen Hoyos git at videolan.org
Mon Apr 25 00:45:36 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Apr 25 00:43:13 2011 +0200| [03546a9ac8753b3f083ae3d2a6397c8c0011923b] | committer: Carl Eugen Hoyos

Support fourcc MMJP.

Fixes ticket #107.

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

 libavformat/riff.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 3950a06..48a8df4 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -151,6 +151,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { CODEC_ID_MJPEG,        MKTAG('A', 'V', 'I', '2') },
     { CODEC_ID_MJPEG,        MKTAG('M', 'T', 'S', 'J') },
     { CODEC_ID_MJPEG,        MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */
+    { CODEC_ID_MJPEG,        MKTAG('M', 'M', 'J', 'P') },
     { CODEC_ID_HUFFYUV,      MKTAG('H', 'F', 'Y', 'U') },
     { CODEC_ID_FFVHUFF,      MKTAG('F', 'F', 'V', 'H') },
     { CODEC_ID_CYUV,         MKTAG('C', 'Y', 'U', 'V') },



More information about the ffmpeg-cvslog mailing list