Merge commit 'ab0742d2f34d70415620441b7ed7da2f03a0c14f'

[ffmpeg] / libavcodec / dv_profile.h

diff --git a/libavcodec/dv_profile.h b/libavcodec/dv_profile.h
index a2ef608b575205e48214c17d6794aaa3c1319d00..34a1a3c6451febdd096785ab7212d1fcbc4ee7e5 100644 (file)
--- a/libavcodec/dv_profile.h
+++ b/libavcodec/dv_profile.h
@@ -59,11 +59,6 @@ typedef struct AVDVProfile {
 
 const AVDVProfile* avpriv_dv_frame_profile2(AVCodecContext* codec, const AVDVProfile *sys,
                                             const uint8_t* frame, unsigned buf_size);
-#if LIBAVCODEC_VERSION_MAJOR < 56
-const AVDVProfile *avpriv_dv_frame_profile(const AVDVProfile *sys,
-                                           const uint8_t* frame, unsigned buf_size);
-const AVDVProfile *avpriv_dv_codec_profile(AVCodecContext* codec);
-#endif
 
 /**
  * Get a DV profile for the provided compressed frame.