aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2017-05-21 23:39:54 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2017-05-21 23:39:54 +0200
commit017a68e8fb8b146eda89b7678e754c4bdaba6f10 (patch)
tree27c1ec561cafab9bd2d2f64b759b4b3b7ebbbdb3
parentb5228e44c7f3a5eba537c8a39a45cfbf2961a28d (diff)
downloadffmpeg-017a68e8fb8b146eda89b7678e754c4bdaba6f10.tar.gz
lavf/riff: Support more vlc fourcc's for 12 and 16 bit yuv4xx.
-rw-r--r--libavcodec/raw.c8
-rw-r--r--libavformat/riff.c8
2 files changed, 16 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 7146e3a0f8..c6be686c53 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -270,6 +270,14 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{ AV_PIX_FMT_YUV422P10BE, MKTAG('I', '2', 'A', 'B') },
{ AV_PIX_FMT_YUV444P10LE, MKTAG('I', '4', 'A', 'L') },
{ AV_PIX_FMT_YUV444P10BE, MKTAG('I', '4', 'A', 'B') },
+ { AV_PIX_FMT_YUV420P12LE, MKTAG('I', '0', 'C', 'L') },
+ { AV_PIX_FMT_YUV420P12BE, MKTAG('I', '0', 'C', 'B') },
+ { AV_PIX_FMT_YUV422P12LE, MKTAG('I', '2', 'C', 'L') },
+ { AV_PIX_FMT_YUV422P12BE, MKTAG('I', '2', 'C', 'B') },
+ { AV_PIX_FMT_YUV444P12LE, MKTAG('I', '4', 'C', 'L') },
+ { AV_PIX_FMT_YUV444P12BE, MKTAG('I', '4', 'C', 'B') },
+ { AV_PIX_FMT_YUV420P16LE, MKTAG('I', '0', 'F', 'L') },
+ { AV_PIX_FMT_YUV420P16BE, MKTAG('I', '0', 'F', 'B') },
{ AV_PIX_FMT_YUV444P16LE, MKTAG('I', '4', 'F', 'L') },
{ AV_PIX_FMT_YUV444P16BE, MKTAG('I', '4', 'F', 'B') },
diff --git a/libavformat/riff.c b/libavformat/riff.c
index ac902fde3b..0497669a36 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -284,6 +284,14 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_RAWVIDEO, MKTAG('I', '4', 'A', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('I', '4', 'F', 'L') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('I', '4', 'F', 'B') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '0', 'C', 'L') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '0', 'C', 'B') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '2', 'C', 'L') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '2', 'C', 'B') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '4', 'C', 'L') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '4', 'C', 'B') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '0', 'F', 'L') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '0', 'F', 'B') },
{ AV_CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') },
{ AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') },
{ AV_CODEC_ID_R210, MKTAG('r', '2', '1', '0') },