diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-10-21 04:44:35 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-10-21 06:02:47 +0100 |
| commit | b7c9873bed7d0be15d8e635d9e737fc3e3fb5008 (patch) | |
| tree | b641ca76add141bbfda8bbb2020a6041e054a2ae | |
| parent | 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab (diff) | |
| download | ffmpeg-b7c9873bed7d0be15d8e635d9e737fc3e3fb5008.tar.gz | |
lavc: add AV_CODEC_ID_DAALA to the list of codec IDs and bump minor
This commit shall introduce the first step of adding support for the
Daala next generation video codec to FFmpeg. Although still in
development, the codec is showing good progress and exchanging work
through IETF drafts. The companies behind Daala are also participating
in the Alliance for Open Media, so it's likely that whatever the result
any of these collaborations produce it's probable that elements from
Daala could be used in them, or perhaps this codec itself could be the
result.
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 7 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 18889ec70c..c55aa9452e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -313,6 +313,7 @@ enum AVCodecID { AV_CODEC_ID_SNOW, AV_CODEC_ID_SMVJPEG, AV_CODEC_ID_APNG, + AV_CODEC_ID_DAALA, /* 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 69798574d8..01d70ca87f 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -737,6 +737,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSY, }, { + .id = AV_CODEC_ID_DAALA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "daala", + .long_name = NULL_IF_CONFIG_SMALL("Daala"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, + }, + { .id = AV_CODEC_ID_DIRAC, .type = AVMEDIA_TYPE_VIDEO, .name = "dirac", diff --git a/libavcodec/version.h b/libavcodec/version.h index 97f4ae44ab..b9aab446a4 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 7 +#define LIBAVCODEC_VERSION_MINOR 8 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |