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/riff.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/riff.c')
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index e3fb953622..2f2f53760a 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -451,7 +451,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_FMVC, MKTAG('F', 'M', 'V', 'C') }, { AV_CODEC_ID_SCPR, MKTAG('S', 'C', 'P', 'R') }, { AV_CODEC_ID_CLEARVIDEO, MKTAG('U', 'C', 'O', 'D') }, - + { AV_CODEC_ID_AV1, MKTAG('A', 'V', '0', '1') }, { AV_CODEC_ID_NONE, 0 } }; |