Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove a memcpy

Browse Source 
Originally committed as revision 12193 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Loren Merritt 17 years ago
parent 8af9090f4f
commit bd58e7f730
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavcodec/pngdec.c

4
libavcodec/pngdec.c
Unescape View File

@ -262,8 +262,8 @@ static void png_handle_row(PNGDecContext *s)
if (s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) { if (s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
png_filter_row(&s->dsp, s->tmp_row, s->crow_buf[0], s->crow_buf + 1, png_filter_row(&s->dsp, s->tmp_row, s->crow_buf[0], s->crow_buf + 1,
s->last_row, s->row_size, s->bpp); s->last_row, s->row_size, s->bpp);
memcpy(s->last_row, s->tmp_row, s->row_size);
convert_to_rgb32(ptr, s->tmp_row, s->width); convert_to_rgb32(ptr, s->tmp_row, s->width);
FFSWAP(uint8_t*, s->last_row, s->tmp_row);
} else { } else {
/* in normal case, we avoid one copy */ /* in normal case, we avoid one copy */
if (s->y == 0) if (s->y == 0)
@ -289,7 +289,7 @@ static void png_handle_row(PNGDecContext *s)
break; break;
png_filter_row(&s->dsp, s->tmp_row, s->crow_buf[0], s->crow_buf + 1, png_filter_row(&s->dsp, s->tmp_row, s->crow_buf[0], s->crow_buf + 1,
s->last_row, s->pass_row_size, s->bpp); s->last_row, s->pass_row_size, s->bpp);
memcpy(s->last_row, s->tmp_row, s->pass_row_size); FFSWAP(uint8_t*, s->last_row, s->tmp_row);
got_line = 1; got_line = 1;
} }
if ((png_pass_dsp_ymask[s->pass] << (s->y & 7)) & 0x80) { if ((png_pass_dsp_ymask[s->pass] << (s->y & 7)) & 0x80) {

Write Preview
Loading…
Cancel
Save