diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-02-12 23:07:17 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-02-12 23:07:17 +0000 |
| commit | 3cf5b6bed7ee88662902467d1d33e631bd97da6d (patch) | |
| tree | af72cff3069ab989a04d425a14d79157916b263e /libavcodec/png.c | |
| parent | 5a4f1328efbdfff55606a0c5213b4a66009d3eff (diff) | |
consistency renaming: rgba32 --> rgb32
Originally committed as revision 7957 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/png.c')
| -rw-r--r-- | libavcodec/png.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/png.c b/libavcodec/png.c index c796c34321..05b4512b7c 100644 --- a/libavcodec/png.c +++ b/libavcodec/png.c @@ -344,7 +344,7 @@ static void png_filter_row(uint8_t *dst, int filter_type, } #ifdef CONFIG_ENCODERS -static void convert_from_rgba32(uint8_t *dst, const uint8_t *src, int width) +static void convert_from_rgb32(uint8_t *dst, const uint8_t *src, int width) { uint8_t *d; int j; @@ -363,7 +363,7 @@ static void convert_from_rgba32(uint8_t *dst, const uint8_t *src, int width) #endif #ifdef CONFIG_DECODERS -static void convert_to_rgba32(uint8_t *dst, const uint8_t *src, int width) +static void convert_to_rgb32(uint8_t *dst, const uint8_t *src, int width) { int j; unsigned int r, g, b, a; @@ -392,7 +392,7 @@ static void png_handle_row(PNGContext *s) png_filter_row(s->tmp_row, s->crow_buf[0], s->crow_buf + 1, s->last_row, s->row_size, s->bpp); memcpy(s->last_row, s->tmp_row, s->row_size); - convert_to_rgba32(ptr, s->tmp_row, s->width); + convert_to_rgb32(ptr, s->tmp_row, s->width); } else { /* in normal case, we avoid one copy */ if (s->y == 0) @@ -422,7 +422,7 @@ static void png_handle_row(PNGContext *s) got_line = 1; } if ((png_pass_dsp_ymask[s->pass] << (s->y & 7)) & 0x80) { - /* NOTE: rgba32 is handled directly in png_put_interlaced_row */ + /* NOTE: RGB32 is handled directly in png_put_interlaced_row */ png_put_interlaced_row(ptr, s->width, s->bits_per_pixel, s->pass, s->color_type, s->last_row); } @@ -882,7 +882,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, if ((png_pass_ymask[pass] << (y & 7)) & 0x80) { ptr = p->data[0] + y * p->linesize[0]; if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) { - convert_from_rgba32(tmp_buf, ptr, avctx->width); + convert_from_rgb32(tmp_buf, ptr, avctx->width); ptr1 = tmp_buf; } else { ptr1 = ptr; @@ -900,7 +900,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, for(y = 0; y < avctx->height; y++) { ptr = p->data[0] + y * p->linesize[0]; if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) - convert_from_rgba32(crow_buf + 1, ptr, avctx->width); + convert_from_rgb32(crow_buf + 1, ptr, avctx->width); else memcpy(crow_buf + 1, ptr, row_size); crow_buf[0] = PNG_FILTER_VALUE_NONE; |