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 /libavcodec/codec_desc.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 'libavcodec/codec_desc.c')
-rw-r--r-- | libavcodec/codec_desc.c | 7 |
1 files changed, 7 insertions, 0 deletions
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 */ { |