diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-12-05 14:33:00 -0500 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-23 10:09:13 +0100 |
| commit | 1146bb3babca3973e88005d267cd06210d6ac075 (patch) | |
| tree | c8eba17d4356003982aa73025cb66b9260f4ab09 | |
| parent | 5c1585c4c3b5281835d784c5daef0069915ccd57 (diff) | |
| download | ffmpeg-1146bb3babca3973e88005d267cd06210d6ac075.tar.gz | |
lavc: Drop deprecated voxware codec entry
Deprecated in 08/2013.
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 9 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f5711baa35..3a007fad1a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -531,9 +531,6 @@ 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, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index dd243c2f0c..8b9ec40e59 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2161,15 +2161,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"), .props = AV_CODEC_PROP_LOSSY, }, -#if FF_API_VOXWARE - { - .id = AV_CODEC_ID_VOXWARE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "voxware", - .long_name = NULL_IF_CONFIG_SMALL("Voxware RT29 Metasound"), - .props = AV_CODEC_PROP_LOSSY, - }, -#endif { .id = AV_CODEC_ID_APE, .type = AVMEDIA_TYPE_AUDIO, diff --git a/libavcodec/version.h b/libavcodec/version.h index 033909a1e4..1f06483211 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -47,9 +47,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_VOXWARE -#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_SET_DIMENSIONS #define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 58) #endif |