diff options
| author | Paul B Mahol <onemda@gmail.com> | 2019-07-11 16:53:09 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2019-07-11 16:53:09 +0200 |
| commit | 2601eef850f1ec37fdcc6f36c89eeb1d361de348 (patch) | |
| tree | 091722192bb0f4077be63b6ab0e997ac6e14aa3d | |
| parent | af9dc02e6b07c66250a76e6c51da65a37e46b953 (diff) | |
| download | ffmpeg-2601eef850f1ec37fdcc6f36c89eeb1d361de348.tar.gz | |
avcodec/magicyuv: add support for recently added YUV444P10
| -rw-r--r-- | libavcodec/magicyuv.c | 7 | ||||
| -rw-r--r-- | libavformat/isom.c | 1 | ||||
| -rw-r--r-- | libavformat/riff.c | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index 1a129c2619..f4fb2a7809 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -592,6 +592,13 @@ static int magy_decode_frame(AVCodecContext *avctx, void *data, s->magy_decode_slice = magy_decode_slice10; s->bps = 10; break; + case 0x76: + avctx->pix_fmt = AV_PIX_FMT_YUV444P10; + s->max = 1024; + s->huff_build = huff_build10; + s->magy_decode_slice = magy_decode_slice10; + s->bps = 10; + break; case 0x6d: avctx->pix_fmt = AV_PIX_FMT_GBRP10; s->decorrelate = 1; diff --git a/libavformat/isom.c b/libavformat/isom.c index 6129e61d7e..c4880878c1 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -290,6 +290,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'R', 'A') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'R', 'G') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'Y', '2') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'Y', '4') }, { 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') }, diff --git a/libavformat/riff.c b/libavformat/riff.c index 56387916f2..e755ad8d5f 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -454,6 +454,7 @@ 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', '0', 'Y', '4') }, { 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') }, |