Merge commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce'

* commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce': riff: Add MultiScope II fourcc MSC2 as MJPEG See: e31cdb5cc8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 2ce2462ba8
parent 85bbe1dbd1 da5c6a97bb
commit 2ce2462ba8
1 changed files with 1 additions and 1 deletions
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@ -171,10 +171,10 @@ const AVCodecTag ff_codec_bmp_tags[] = {
    { AV_CODEC_ID_MPEG1VIDEO,   MKTAG('B', 'W', '1', '0') },
    { AV_CODEC_ID_MPEG1VIDEO,   MKTAG('X', 'M', 'P', 'G') }, /* Xing MPEG intra only */
    { AV_CODEC_ID_MJPEG,        MKTAG('M', 'J', 'P', 'G') },
+    { AV_CODEC_ID_MJPEG,        MKTAG('M', 'S', 'C', '2') }, /* Multiscope II */
    { AV_CODEC_ID_MJPEG,        MKTAG('L', 'J', 'P', 'G') },
    { AV_CODEC_ID_MJPEG,        MKTAG('d', 'm', 'b', '1') },
    { AV_CODEC_ID_MJPEG,        MKTAG('m', 'j', 'p', 'a') },
-    { AV_CODEC_ID_MJPEG,        MKTAG('M', 'S', 'C', '2') }, /* Multiscope II */
    { AV_CODEC_ID_LJPEG,        MKTAG('L', 'J', 'P', 'G') },
    /* Pegasus lossless JPEG */
    { AV_CODEC_ID_MJPEG,        MKTAG('J', 'P', 'G', 'L') },