RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2() 

Functions used across libraries should have avpriv_ and not ff_ prefixes.
This commit is contained in:
Diego Biurrun 2012-10-04 21:15:51 +02:00
parent b6f8d635f2
commit 52d113ee06
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/bmpenc.c
View File

@ -93,7 +93,7 @@ static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
case AV_PIX_FMT_RGB4_BYTE: case AV_PIX_FMT_RGB4_BYTE:
case AV_PIX_FMT_BGR4_BYTE: case AV_PIX_FMT_BGR4_BYTE:
case AV_PIX_FMT_GRAY8: 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: case AV_PIX_FMT_PAL8:
pal = (uint32_t *)p->data[1]; pal = (uint32_t *)p->data[1];
break; break;

2
libavcodec/rawdec.c
View File

@ -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) 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); 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); 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) && if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) &&
avctx->pix_fmt==AV_PIX_FMT_PAL8 && avctx->pix_fmt==AV_PIX_FMT_PAL8 &&

2
libavcodec/utils.c
View File

@ -482,7 +482,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
buf->linesize[i] = 0; buf->linesize[i] = 0;
} }
if (size[1] && !size[2]) 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->width = s->width;
buf->height = s->height; buf->height = s->height;
buf->pix_fmt = s->pix_fmt; buf->pix_fmt = s->pix_fmt;

4
libavutil/imgutils.c
View File

@ -136,7 +136,7 @@ int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int hei
return total_size; 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; int i;
@ -204,7 +204,7 @@ int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
return ret; return ret;
} }
if (desc->flags & PIX_FMT_PAL || desc->flags & PIX_FMT_PSEUDOPAL) 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; return ret;
} }

2
libavutil/imgutils.h
View File

@ -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 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);
/** /**
* @} * @}