eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'

Browse Source 
* commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb':
  av1: Add codec_id and basic demuxing support

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch
2017-03-19 18:28:40 +01:00
parent f4a39ceea0 d42809f983
commit ed223eeab3
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/riff.c
View File

@@ -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 }
};