summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2016-07-24 21:17:10 +0200
committerDiego Biurrun <diego@biurrun.de>2016-08-24 14:45:08 +0200
commitd42809f9835a4e9e5c7c63210abb09ad0ef19cfb (patch)
tree450051e5687e8caf33eb6ac3c6465792b67a73d2 /libavformat
parent24130234cd9dd733116d17b724ea4c8e12ce097a (diff)
av1: Add codec_id and basic demuxing support
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroska.c1
-rw-r--r--libavformat/riff.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index c25c962363..8842d7c464 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -66,6 +66,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"S_DVBSUB" , AV_CODEC_ID_DVB_SUBTITLE},
{"S_HDMV/PGS" , AV_CODEC_ID_HDMV_PGS_SUBTITLE},
+ {"V_AV1" , AV_CODEC_ID_AV1},
{"V_DIRAC" , AV_CODEC_ID_DIRAC},
{"V_MJPEG" , AV_CODEC_ID_MJPEG},
{"V_MPEG1" , AV_CODEC_ID_MPEG1VIDEO},
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 1e1e4d8c61..54bef835ba 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -367,6 +367,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ 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_AV1, MKTAG('A', 'V', '0', '1') },
{ AV_CODEC_ID_NONE, 0 }
};