diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-12 12:16:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-12 12:17:59 +0200 |
| commit | 2ce2462ba8575ce16363064aecfc9fe2f4396bba (patch) | |
| tree | 6a238fbfb1884febd180c53a9ab71e9ddda9706a /libavformat/riff.c | |
| parent | 85bbe1dbd1cc2e72ea30958af9115b727e958b99 (diff) | |
| parent | da5c6a97bbfe34d4b30a89e72150dd400299ddce (diff) | |
Merge commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce'
* commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce':
riff: Add MultiScope II fourcc MSC2 as MJPEG
See: e31cdb5cc8080e164c66838a69f37f60f2d0ea82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 389231a369..850e2574c4 100644 --- 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') }, |