diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-07-09 18:40:13 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-07-10 12:03:08 +0200 |
| commit | 0281d5ece640d9ee8113846f0e21442a56356c82 (patch) | |
| tree | b6424f72c3dedf4ddd5dcfb68607d6907c3ad8db /libavformat | |
| parent | fa3fd7f5a003794da8969ec21688e870c03100d6 (diff) | |
avcodec/magicyuv: add 12 bit formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/isom.c | 2 | ||||
| -rw-r--r-- | libavformat/riff.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 3a9b3baf96..0ae8450469 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -289,6 +289,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'Y', '2') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'Y', '4') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'Y', 'A') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '2', 'R', 'A') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '2', 'R', 'G') }, { AV_CODEC_ID_SHEERVIDEO, MKTAG('S', 'h', 'r', '0') }, { AV_CODEC_ID_SHEERVIDEO, MKTAG('S', 'h', 'r', '1') }, diff --git a/libavformat/riff.c b/libavformat/riff.c index 0497669a36..029e7efbd3 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -447,6 +447,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'R', 'G') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'G', '0') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'Y', '2') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '2', 'R', 'A') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '2', 'R', 'G') }, { AV_CODEC_ID_YLC, MKTAG('Y', 'L', 'C', '0') }, { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '0') }, { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '1') }, |