[FFmpeg-cvslog] avcodec: rename avpriv_color_frame to ff_color_frame
Andreas Cadhalpun
git at videolan.org
Thu Oct 22 00:43:22 CEST 2015
ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Wed Oct 14 01:42:10 2015 +0200| [a4680e71707e59f6b646b989ac4e1bec24841941] | committer: Andreas Cadhalpun
avcodec: rename avpriv_color_frame to ff_color_frame
It is only used inside libavcodec.
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4680e71707e59f6b646b989ac4e1bec24841941
---
libavcodec/h264_slice.c | 2 +-
libavcodec/internal.h | 2 +-
libavcodec/utils.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index a346ccb..3f41e9b 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -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);
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 324f099..0abe17f 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -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);
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0ae35ed..d3a495e 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -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;
More information about the ffmpeg-cvslog
mailing list