diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-21 23:56:51 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-21 23:56:51 -0300 |
| commit | 898349d702064906e9b4830999465a1a381afcfb (patch) | |
| tree | cf36dca80baf5f98e336884ceac3a7abb4481a7b | |
| parent | 5ad1a989b67dedf801abc78ad7dc86ff573c1406 (diff) | |
| parent | 1146bb3babca3973e88005d267cd06210d6ac075 (diff) | |
| download | ffmpeg-898349d702064906e9b4830999465a1a381afcfb.tar.gz | |
Merge commit '1146bb3babca3973e88005d267cd06210d6ac075'
* commit '1146bb3babca3973e88005d267cd06210d6ac075':
lavc: Drop deprecated voxware codec entry
Merged-by: James Almer <jamrial@gmail.com>
| -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 dfbb61ca88..e02445e383 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -582,9 +582,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 6a13bbbf0e..669d2458c9 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2499,15 +2499,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 9040dae8fb..95be1ed4cd 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_LOWRES #define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#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 |