Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / dvdata.c

diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c
index 66265bc331c497bcb1f451f19151f74d6b7f1a29..b29f5ce53f448272833659d592da663abc14336e 100644 (file)
--- a/libavcodec/dvdata.c
+++ b/libavcodec/dvdata.c
@@ -246,7 +246,7 @@ static const DVprofile dv_profiles[] = {
     }
 };
 
-const DVprofile* ff_dv_frame_profile2(AVCodecContext* codec, const DVprofile *sys,
+const DVprofile* avpriv_dv_frame_profile2(AVCodecContext* codec, const DVprofile *sys,
                                   const uint8_t* frame, unsigned buf_size)
 {
    int i, dsf, stype;
@@ -276,13 +276,13 @@ const DVprofile* ff_dv_frame_profile2(AVCodecContext* codec, const DVprofile *sy
    return NULL;
 }
 
-const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
+const DVprofile* avpriv_dv_frame_profile(const DVprofile *sys,
                                   const uint8_t* frame, unsigned buf_size)
 {
-    return ff_dv_frame_profile2(NULL, sys, frame, buf_size);
+    return avpriv_dv_frame_profile2(NULL, sys, frame, buf_size);
 }
 
-const DVprofile* ff_dv_codec_profile(AVCodecContext* codec)
+const DVprofile* avpriv_dv_codec_profile(AVCodecContext* codec)
 {
     int i;