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 @@ -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 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, \