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 | |
| parent | f4a39ceea0d25a21c9c6e0cc64a0825fd5d84c5b (diff) | |
| parent | d42809f9835a4e9e5c7c63210abb09ad0ef19cfb (diff) | |
| download | ffmpeg-ed223eeab34c251856e17440ff17a1faaf4f2560.tar.gz | |
Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'
* commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb':
av1: Add codec_id and basic demuxing support
Merged-by: Clément Bœsch <u@pkh.me>
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 7 | ||||
| -rw-r--r-- | libavformat/matroska.c | 1 | ||||
| -rw-r--r-- | libavformat/riff.c | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8774718abb..ea3cb4506b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -440,6 +440,7 @@ enum AVCodecID { AV_CODEC_ID_SCPR, AV_CODEC_ID_CLEARVIDEO, AV_CODEC_ID_XPM, + AV_CODEC_ID_AV1, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index c0418e4880..4e98cf9549 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1374,6 +1374,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Iterated Systems ClearVideo"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_AV1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "av1", + .long_name = NULL_IF_CONFIG_SMALL("Alliance for Open Media AV1"), + .props = AV_CODEC_PROP_LOSSY, + }, /* image codecs */ { 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}, 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 } }; |