diff --git a/libavcodec/dv_profile.c b/libavcodec/dv_profile.c index e336e081ea..66505c886b 100644 --- a/libavcodec/dv_profile.c +++ b/libavcodec/dv_profile.c @@ -297,14 +297,6 @@ const AVDVProfile* ff_dv_frame_profile(AVCodecContext* codec, const AVDVProfile return NULL; } -#if FF_API_DV_FRAME_PROFILE -const AVDVProfile* avpriv_dv_frame_profile2(AVCodecContext* codec, const AVDVProfile *sys, - const uint8_t *frame, unsigned buf_size) -{ - return ff_dv_frame_profile(codec, sys, frame, buf_size); -} -#endif - const AVDVProfile *av_dv_frame_profile(const AVDVProfile *sys, const uint8_t *frame, unsigned buf_size) { diff --git a/libavcodec/dv_profile.h b/libavcodec/dv_profile.h index d22ad2663f..9380a66f07 100644 --- a/libavcodec/dv_profile.h +++ b/libavcodec/dv_profile.h @@ -58,15 +58,6 @@ typedef struct AVDVProfile { const uint8_t (*audio_shuffle)[9]; /* PCM shuffling table */ } AVDVProfile; -#if FF_API_DV_FRAME_PROFILE -/** - * @deprecated use av_dv_frame_profile() - */ -attribute_deprecated -const AVDVProfile* avpriv_dv_frame_profile2(AVCodecContext* codec, const AVDVProfile *sys, - const uint8_t* frame, unsigned buf_size); -#endif - /** * Get a DV profile for the provided compressed frame. * diff --git a/libavcodec/version.h b/libavcodec/version.h index 7c8a1691da..b7b502a939 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -161,9 +161,6 @@ /* XXX: don't forget to drop the -vismv documentation */ #define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 57) #endif -#ifndef FF_API_DV_FRAME_PROFILE -#define FF_API_DV_FRAME_PROFILE (LIBAVCODEC_VERSION_MAJOR < 57) -#endif #ifndef FF_API_AUDIOENC_DELAY #define FF_API_AUDIOENC_DELAY (LIBAVCODEC_VERSION_MAJOR < 58) #endif