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 /libavutil | |
| parent | de3b1116dab12843b833e828bb219fb5673b0092 (diff) | |
| parent | 7638f0b2fef0481e55985ab8530e8ad9c16f113a (diff) | |
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 'libavutil')
| -rw-r--r-- | libavutil/imgutils.c | 4 | ||||
| -rw-r--r-- | libavutil/imgutils.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index e4460d3cea..0cff34123c 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -146,7 +146,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; @@ -214,7 +214,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 f10000cdc8..a9317a71e1 100644 --- a/libavutil/imgutils.h +++ b/libavutil/imgutils.h @@ -187,7 +187,7 @@ int av_image_copy_to_buffer(uint8_t *dst, int dst_size, */ 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); /** * @} |