avcodec/magicyuv: add support for recently added YUV444P10

diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c
index 1a129c26198af3645bedbccd647fed2ecf063012..f4fb2a780978ce989ee21301ea7931fc6e4e660d 100644 (file)
--- 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 6129e61d7e356fccc592fba476ada1013f60a7a8..c4880878c1b1c324bee26f97de6c45f68bdd5194 100644 (file)
--- 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 56387916f2947d6c694329cafbc23e88013c081a..e755ad8d5fbdd0a124b8983d03bc4869728a19ce 100644 (file)
--- 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') },