| @@ -531,9 +531,6 @@ enum AVCodecID { | |||||
| AV_CODEC_ID_MLP, | AV_CODEC_ID_MLP, | ||||
| AV_CODEC_ID_GSM_MS, /* as found in WAV */ | AV_CODEC_ID_GSM_MS, /* as found in WAV */ | ||||
| AV_CODEC_ID_ATRAC3, | AV_CODEC_ID_ATRAC3, | ||||
| #if FF_API_VOXWARE | |||||
| AV_CODEC_ID_VOXWARE, | |||||
| #endif | |||||
| AV_CODEC_ID_APE, | AV_CODEC_ID_APE, | ||||
| AV_CODEC_ID_NELLYMOSER, | AV_CODEC_ID_NELLYMOSER, | ||||
| AV_CODEC_ID_MUSEPACK8, | AV_CODEC_ID_MUSEPACK8, | ||||
| @@ -2161,15 +2161,6 @@ static const AVCodecDescriptor codec_descriptors[] = { | |||||
| .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"), | .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"), | ||||
| .props = AV_CODEC_PROP_LOSSY, | .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, | .id = AV_CODEC_ID_APE, | ||||
| .type = AVMEDIA_TYPE_AUDIO, | .type = AVMEDIA_TYPE_AUDIO, | ||||
| @@ -47,9 +47,6 @@ | |||||
| * the public API and may change, break or disappear at any time. | * 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 | #ifndef FF_API_SET_DIMENSIONS | ||||
| #define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 58) | #define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 58) | ||||
| #endif | #endif | ||||