diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 18:19:48 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 18:19:48 +0400 |
| commit | 8ab97a60ef949f9f2cc0de768143c3ce89a1aabf (patch) | |
| tree | 774977e67d24d31e78d11b94b595507beec318d2 /libavcodec/iff.c | |
| parent | c0c06c1bba80c4bee162a3c40eec678ddc65571d (diff) | |
| parent | a0cabd0a27587525e90a44660c795d40d2f44fe2 (diff) | |
Merge commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2'
* commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2':
mimic: cosmetics, reformat
iff: drop ff_ prefix from a static function.
pngdec: cosmetics, reformat.
dxa: return meaningful error codes.
eatgq: cosmetics, reformat.
Conflicts:
libavcodec/dxa.c
libavcodec/eatgq.c
libavcodec/iff.c
libavcodec/mimic.c
libavcodec/pngdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/iff.c')
| -rw-r--r-- | libavcodec/iff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c index bebf6a5272..ac23cc7041 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -139,7 +139,7 @@ static av_always_inline uint32_t gray2rgb(const uint32_t x) { /** * Convert CMAP buffer (stored in extradata) to lavc palette format */ -static int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) +static int cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) { IffContext *s = avctx->priv_data; int count, i; @@ -671,10 +671,10 @@ static int decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return res; } else if (avctx->bits_per_coded_sample <= 8 && avctx->pix_fmt == AV_PIX_FMT_PAL8) { - if ((res = ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1])) < 0) + if ((res = cmap_read_palette(avctx, (uint32_t*)s->frame.data[1])) < 0) return res; } else if (avctx->pix_fmt == AV_PIX_FMT_RGB32 && avctx->bits_per_coded_sample <= 8) { - if ((res = ff_cmap_read_palette(avctx, s->mask_palbuf)) < 0) + if ((res = cmap_read_palette(avctx, s->mask_palbuf)) < 0) return res; } s->init = 1; |