diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 15:11:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 15:11:34 +0200 |
| commit | d6f6a7557c8d25bb9943b4d3390550a9cffb918b (patch) | |
| tree | d3f96d36dc86276ae0018c4294d416c972f3ea28 /libavcodec | |
| parent | de3b1116dab12843b833e828bb219fb5673b0092 (diff) | |
| parent | 7638f0b2fef0481e55985ab8530e8ad9c16f113a (diff) | |
| download | ffmpeg-d6f6a7557c8d25bb9943b4d3390550a9cffb918b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: Do not make ff_ symbols globally visible.
avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
build: tms470: work around glibc math.h problems
configure: improve tms470 compiler usage with glibc
Conflicts:
libavcodec/bmpenc.c
libavcodec/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/bmpenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/pcxenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/rawdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index fc3602868f..bda679903c 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -99,7 +99,7 @@ static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt, case AV_PIX_FMT_BGR4_BYTE: case AV_PIX_FMT_GRAY8: av_assert1(bit_count == 8); - ff_set_systematic_pal2(palette256, avctx->pix_fmt); + avpriv_set_systematic_pal2(palette256, avctx->pix_fmt); pal = palette256; break; case AV_PIX_FMT_PAL8: diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c index 7f710a2c12..7cb3af3243 100644 --- a/libavcodec/pcxenc.c +++ b/libavcodec/pcxenc.c @@ -131,7 +131,7 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, case AV_PIX_FMT_GRAY8: bpp = 8; nplanes = 1; - ff_set_systematic_pal2(palette256, avctx->pix_fmt); + avpriv_set_systematic_pal2(palette256, avctx->pix_fmt); pal = palette256; break; case AV_PIX_FMT_PAL8: diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index d426f437f5..3496bb0ce0 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -108,7 +108,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) return AVERROR(EINVAL); } - ff_set_systematic_pal2(context->palette, avctx->pix_fmt); + avpriv_set_systematic_pal2(context->palette, avctx->pix_fmt); if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) && avctx->pix_fmt==AV_PIX_FMT_PAL8 && (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))){ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index ae748b5f37..d64de0e467 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -544,7 +544,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; |