Mercurial > libavformat.hg

changeset 5999:4c9cebd37fde libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add FourCC MJPG for CODEC_ID_JPEGLS. Patch by Francesco Lavra, francescolavra interfree it
author cehoyos
date Sun, 09 May 2010 23:19:19 +0000
parents ec720621cd71
children b6114dd198a9
files riff.c
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/riff.c	Sun May 09 22:56:04 2010 +0000
+++ b/riff.c	Sun May 09 23:19:19 2010 +0000
@@ -129,6 +129,7 @@
     { CODEC_ID_LJPEG,        MKTAG('L', 'J', 'P', 'G') },
     { CODEC_ID_MJPEG,        MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */
     { CODEC_ID_JPEGLS,       MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
+    { CODEC_ID_JPEGLS,       MKTAG('M', 'J', 'P', 'G') },
     { CODEC_ID_MJPEG,        MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */
     { CODEC_ID_MJPEG,        MKTAG('j', 'p', 'e', 'g') },
     { CODEC_ID_MJPEG,        MKTAG('I', 'J', 'P', 'G') },