]> git.sesse.net Git - ffmpeg/commitdiff
avcodec: rename avpriv_color_frame to ff_color_frame
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Tue, 13 Oct 2015 23:42:10 +0000 (01:42 +0200)
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Wed, 21 Oct 2015 22:38:50 +0000 (00:38 +0200)
It is only used inside libavcodec.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
libavcodec/h264_slice.c
libavcodec/internal.h
libavcodec/utils.c

index a346ccbc00407dd1b0783d6f349df4839e908c12..3f41e9bbdd1c85eb54dd70961d7b5d88f6a078ac 100644 (file)
@@ -617,7 +617,7 @@ static int h264_frame_start(H264Context *h)
        && !(h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU)
 #endif
        )
-        avpriv_color_frame(pic->f, c);
+        ff_color_frame(pic->f, c);
 
     h->cur_pic_ptr = pic;
     ff_h264_unref_picture(h, &h->cur_pic);
index 324f0998af4b4bbce5a2d49ad68b2307b994eb46..0abe17fed066ed6562d0ec23f73c5b25efd0fa81 100644 (file)
@@ -178,7 +178,7 @@ unsigned int avpriv_toupper4(unsigned int x);
 int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame);
 
 
-void avpriv_color_frame(AVFrame *frame, const int color[4]);
+void ff_color_frame(AVFrame *frame, const int color[4]);
 
 extern volatile int ff_avcodec_locked;
 int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec);
index 0ae35ed1e4b4299b5d359223a1bffdb2f64ac61c..d3a495ec5f03f96bc91a883699adc61cc3b16340 100644 (file)
@@ -687,7 +687,7 @@ fail:
     return AVERROR(ENOMEM);
 }
 
-void avpriv_color_frame(AVFrame *frame, const int c[4])
+void ff_color_frame(AVFrame *frame, const int c[4])
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
     int p, y, x;