Skip to content

F
ffmpeg.wasm-core
Commit bd58e7f7 authored by Loren Merritt's avatar Loren Merritt
Browse files
Options

remove a memcpy 

Originally committed as revision 12193 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8af9090f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/pngdec.c
View file @ bd58e7f7
...@@ -262,8 +262,8 @@ static void png_handle_row(PNGDecContext *s) ...@@ -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) ...@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment