Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / dv_profile.c

diff --git a/ffmpeg/libavcodec/dv_profile.c b/ffmpeg/libavcodec/dv_profile.c
index 084f3047bc211aec829566834c02257a5c290365..b301cbfb8b30bc5f7c2bb84aa1a8d0a381e39468 100644 (file)
--- a/ffmpeg/libavcodec/dv_profile.c
+++ b/ffmpeg/libavcodec/dv_profile.c
@@ -257,7 +257,7 @@ void ff_dv_print_profiles(void *logctx, int loglevel)
 
 #endif /* CONFIG_DVPROFILE */
 
-const AVDVProfile* avpriv_dv_frame_profile2(AVCodecContext* codec, const AVDVProfile *sys,
+const AVDVProfile* ff_dv_frame_profile(AVCodecContext* codec, const AVDVProfile *sys,
                                        const uint8_t *frame, unsigned buf_size)
 {
 #if CONFIG_DVPROFILE
@@ -297,10 +297,18 @@ const AVDVProfile* avpriv_dv_frame_profile2(AVCodecContext* codec, const AVDVPro
     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)
 {
-    return avpriv_dv_frame_profile2(NULL, sys, frame, buf_size);
+    return ff_dv_frame_profile(NULL, sys, frame, buf_size);
 }
 
 const AVDVProfile *av_dv_codec_profile(int width, int height,