Merge commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be'

[ffmpeg] / libavcodec / dv_profile.h

diff --git a/libavcodec/dv_profile.h b/libavcodec/dv_profile.h
index d22ad2663fbf31e42c8f9e5b6d2f319c720ce7ff..9380a66f0705024c7f83d4ee8cc3d24d7c69df2a 100644 (file)
--- 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.
  *