diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2013-08-06 09:57:05 +0200 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2013-08-07 10:56:18 +0200 |
| commit | f544c586364e157e52ecc8697bee77d342150999 (patch) | |
| tree | 0e6233768a4faec436aed797ff60c92a11fa951e | |
| parent | 62572435d4106098c090fb8f129a9090e41ff1eb (diff) | |
| download | ffmpeg-f544c586364e157e52ecc8697bee77d342150999.tar.gz | |
deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead
Voxware is the name of company, it has produced several audio codecs e.g.
MetaVoice family and MetaSound.
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 9 | ||||
| -rw-r--r-- | libavcodec/version.h | 5 | ||||
| -rw-r--r-- | libavformat/riff.c | 2 |
4 files changed, 17 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7b26de1c53..adfd25a230 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -383,7 +383,9 @@ enum AVCodecID { AV_CODEC_ID_MLP, AV_CODEC_ID_GSM_MS, /* as found in WAV */ AV_CODEC_ID_ATRAC3, +#if FF_API_VOXWARE AV_CODEC_ID_VOXWARE, +#endif AV_CODEC_ID_APE, AV_CODEC_ID_NELLYMOSER, AV_CODEC_ID_MUSEPACK8, @@ -415,6 +417,7 @@ enum AVCodecID { AV_CODEC_ID_OPUS, AV_CODEC_ID_COMFORT_NOISE, AV_CODEC_ID_TAK, + AV_CODEC_ID_METASOUND, /* 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 b0da005686..b91b468a5b 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1923,6 +1923,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"), .props = AV_CODEC_PROP_LOSSY, }, +#if FF_API_VOXWARE { .id = AV_CODEC_ID_VOXWARE, .type = AVMEDIA_TYPE_AUDIO, @@ -1930,6 +1931,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Voxware RT29 Metasound"), .props = AV_CODEC_PROP_LOSSY, }, +#endif { .id = AV_CODEC_ID_APE, .type = AVMEDIA_TYPE_AUDIO, @@ -2147,6 +2149,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("TAK (Tom's lossless Audio Kompressor)"), .props = AV_CODEC_PROP_LOSSLESS, }, + { + .id = AV_CODEC_ID_METASOUND, + .type = AVMEDIA_TYPE_AUDIO, + .name = "metasound", + .long_name = NULL_IF_CONFIG_SMALL("Voxware MetaSound"), + .props = AV_CODEC_PROP_LOSSY, + }, /* subtitle codecs */ { diff --git a/libavcodec/version.h b/libavcodec/version.h index 7a622f38f9..4637b3a838 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,7 +27,7 @@ */ #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 13 +#define LIBAVCODEC_VERSION_MINOR 14 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -70,5 +70,8 @@ #ifndef FF_API_BUFS_VDPAU #define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_VOXWARE +#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ diff --git a/libavformat/riff.c b/libavformat/riff.c index 6fe310ad0a..8216261527 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -347,7 +347,7 @@ const AVCodecTag ff_codec_wav_tags[] = { /* rogue format number */ { AV_CODEC_ID_ADPCM_IMA_DK3, 0x0062 }, { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0069 }, - { AV_CODEC_ID_VOXWARE, 0x0075 }, + { AV_CODEC_ID_METASOUND, 0x0075 }, { AV_CODEC_ID_AAC, 0x00ff }, { AV_CODEC_ID_SIPR, 0x0130 }, { AV_CODEC_ID_WMAV1, 0x0160 }, |