diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-06-18 18:23:28 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-06-20 15:45:51 -0400 |
| commit | d78fd2fa21cde28465e40dd0be4446b1387d22a6 (patch) | |
| tree | 6a8be757e33deb91c6cd1c377dbbfe1a125dd07f /libavformat | |
| parent | ec9f04423b82afa323e90f5b2c677be74302c1fd (diff) | |
| download | ffmpeg-d78fd2fa21cde28465e40dd0be4446b1387d22a6.tar.gz | |
Add MagicYUV decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/isom.c | 8 | ||||
| -rw-r--r-- | libavformat/riff.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 226c275207..018356311f 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -257,6 +257,14 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_DXV, MKTAG('D', 'X', 'D', '3') }, { AV_CODEC_ID_DXV, MKTAG('D', 'X', 'D', 'I') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'R', 'G') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'R', 'A') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'G', '0') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'Y', '0') }, + { 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_NONE, 0 }, }; diff --git a/libavformat/riff.c b/libavformat/riff.c index 2cbe0382d7..b1b51e2a08 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -365,6 +365,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_SCREENPRESSO, MKTAG('S', 'P', 'V', '1') }, { AV_CODEC_ID_RSCC, MKTAG('R', 'S', 'C', 'C') }, { AV_CODEC_ID_RSCC, MKTAG('I', 'S', 'C', 'C') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', 'A', 'G', 'Y') }, { AV_CODEC_ID_NONE, 0 } }; |