diff options
| -rw-r--r-- | libavcodec/bmpenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/rawdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 | ||||
| -rw-r--r-- | libavutil/imgutils.c | 4 | ||||
| -rw-r--r-- | libavutil/imgutils.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index a798f34409..d27282dc13 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -93,7 +93,7 @@ static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt, case AV_PIX_FMT_RGB4_BYTE: case AV_PIX_FMT_BGR4_BYTE: case AV_PIX_FMT_GRAY8: - ff_set_systematic_pal2((uint32_t*)p->data[1], avctx->pix_fmt); + avpriv_set_systematic_pal2((uint32_t*)p->data[1], avctx->pix_fmt); case AV_PIX_FMT_PAL8: pal = (uint32_t *)p->data[1]; break; diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 0f47e3f96d..449755f9b2 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -86,7 +86,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) else if (avctx->pix_fmt == AV_PIX_FMT_NONE && avctx->bits_per_coded_sample) avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample); - ff_set_systematic_pal2(context->palette, avctx->pix_fmt); + avpriv_set_systematic_pal2(context->palette, avctx->pix_fmt); context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) && avctx->pix_fmt==AV_PIX_FMT_PAL8 && diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 4a3ac72b6c..bb99a5a32d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -482,7 +482,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) buf->linesize[i] = 0; } if (size[1] && !size[2]) - ff_set_systematic_pal2((uint32_t *)buf->data[1], s->pix_fmt); + avpriv_set_systematic_pal2((uint32_t *)buf->data[1], s->pix_fmt); buf->width = s->width; buf->height = s->height; buf->pix_fmt = s->pix_fmt; diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index e661e1bf8d..413329d50b 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -136,7 +136,7 @@ int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int hei return total_size; } -int ff_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt) +int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt) { int i; @@ -204,7 +204,7 @@ int av_image_alloc(uint8_t *pointers[4], int linesizes[4], return ret; } if (desc->flags & PIX_FMT_PAL || desc->flags & PIX_FMT_PSEUDOPAL) - ff_set_systematic_pal2((uint32_t*)pointers[1], pix_fmt); + avpriv_set_systematic_pal2((uint32_t*)pointers[1], pix_fmt); return ret; } diff --git a/libavutil/imgutils.h b/libavutil/imgutils.h index 4f355bd232..71510132ae 100644 --- a/libavutil/imgutils.h +++ b/libavutil/imgutils.h @@ -128,7 +128,7 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4], */ int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx); -int ff_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt); +int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt); /** * @} |