diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2016-07-24 21:17:10 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2016-08-24 14:45:08 +0200 |
commit | d42809f9835a4e9e5c7c63210abb09ad0ef19cfb (patch) | |
tree | 450051e5687e8caf33eb6ac3c6465792b67a73d2 /libavcodec | |
parent | 24130234cd9dd733116d17b724ea4c8e12ce097a (diff) | |
download | ffmpeg-d42809f9835a4e9e5c7c63210abb09ad0ef19cfb.tar.gz |
av1: Add codec_id and basic demuxing support
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
-rw-r--r-- | libavcodec/codec_desc.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ace761dd56..7a5f10f1c9 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -391,6 +391,7 @@ enum AVCodecID { AV_CODEC_ID_RSCC, AV_CODEC_ID_MAGICYUV, AV_CODEC_ID_TRUEMOTION2RT, + 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 78d2cbc749..18568c9622 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1205,6 +1205,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0 Real Time"), .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 */ { |