diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 18:28:40 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 18:28:40 +0100 |
| commit | ed223eeab34c251856e17440ff17a1faaf4f2560 (patch) | |
| tree | 5d6541c4d06b4e6181ca577501460d9a58482093 /libavformat/matroska.c | |
| parent | f4a39ceea0d25a21c9c6e0cc64a0825fd5d84c5b (diff) | |
| parent | d42809f9835a4e9e5c7c63210abb09ad0ef19cfb (diff) | |
Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'
* commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb':
av1: Add codec_id and basic demuxing support
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat/matroska.c')
| -rw-r--r-- | libavformat/matroska.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 6af667c36b..94ccbecedb 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -77,6 +77,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_HDMV/PGS" , AV_CODEC_ID_HDMV_PGS_SUBTITLE}, {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, + {"V_AV1" , AV_CODEC_ID_AV1}, {"V_DIRAC" , AV_CODEC_ID_DIRAC}, {"V_FFV1" , AV_CODEC_ID_FFV1}, {"V_MJPEG" , AV_CODEC_ID_MJPEG}, |