diff options
| author | Andrew D'Addesio <modchipv12@gmail.com> | 2012-09-18 19:02:14 -0600 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-09-27 10:48:35 +0200 |
| commit | 2a3d82ab467183fd108f451a85ca06ebc2a57e2c (patch) | |
| tree | 4e83230db66783e350c8c6619888f3073f8ab636 | |
| parent | 0575772fa04e77fbb3755ad1cb8f040713c1e0d7 (diff) | |
| download | ffmpeg-2a3d82ab467183fd108f451a85ca06ebc2a57e2c.tar.gz | |
Add Opus codec id and codec description.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -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 a89805e558..a7aec4e949 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -405,6 +405,7 @@ enum AVCodecID { AV_CODEC_ID_RALF, AV_CODEC_ID_IAC, AV_CODEC_ID_ILBC, + AV_CODEC_ID_OPUS, /* subtitle codecs */ AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 51fc1714d1..818a35e804 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2105,6 +2105,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_OPUS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "opus", + .long_name = NULL_IF_CONFIG_SMALL("Opus (Opus Interactive Audio Codec)"), + .props = AV_CODEC_PROP_LOSSY, + }, /* subtitle codecs */ { diff --git a/libavcodec/version.h b/libavcodec/version.h index c53286872e..ee70842d0e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,7 +27,7 @@ */ #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 28 +#define LIBAVCODEC_VERSION_MINOR 29 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |