Merge commit '6064f697a321174232a3fad351afb21150c3e9e5'

[ffmpeg] / libavcodec / dv_profile.c

diff --git a/libavcodec/dv_profile.c b/libavcodec/dv_profile.c
index e336e081ea18384de1fc3b520028c53f75eb4e5e..66505c886b4d4eb096b6f2c3bd178ace63b1d369 100644 (file)
--- 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)
 {