From b7c9873bed7d0be15d8e635d9e737fc3e3fb5008 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Wed, 21 Oct 2015 04:44:35 +0100 Subject: [PATCH] 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. --- libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 +++++++ libavcodec/version.h | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 18889ec70c0..c55aa9452e0 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 69798574d8c..01d70ca87f0 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -736,6 +736,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Escape 124"), .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, diff --git a/libavcodec/version.h b/libavcodec/version.h index 97f4ae44ab3..b9aab446a43 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, \ -- 2.39.5