generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix unaligned dsputil call.

Browse Source 
Should fix FATE corepng test on Solaris/Sparc.

Originally committed as revision 18930 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak
2009-05-24 12:44:54 +00:00
parent 46b4019bfa
commit 09d1208cdb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/pngdec.c
View File

@@ -387,6 +387,7 @@ static int decode_frame(AVCodecContext *avctx,
PNGDecContext * const s = avctx->priv_data; PNGDecContext * const s = avctx->priv_data;
AVFrame *picture = data; AVFrame *picture = data;
AVFrame *p; AVFrame *p;
uint8_t *crow_buf_base = NULL;
uint32_t tag, length; uint32_t tag, length;
int ret, crc; int ret, crc;
@@ -527,9 +528,12 @@ static int decode_frame(AVCodecContext *avctx,
goto fail; goto fail;
} }
/* compressed row */ /* compressed row */
s->crow_buf = av_malloc(s->row_size + 1); crow_buf_base = av_malloc(s->row_size + 16);
if (!s->crow_buf) if (!crow_buf_base)
goto fail; goto fail;
/* we want crow_buf+1 to be 16-byte aligned */
s->crow_buf = crow_buf_base + 15;
s->zstream.avail_out = s->crow_size; s->zstream.avail_out = s->crow_size;
s->zstream.next_out = s->crow_buf; s->zstream.next_out = s->crow_buf;
} }
@@ -612,7 +616,8 @@ static int decode_frame(AVCodecContext *avctx,
ret = s->bytestream - s->bytestream_start; ret = s->bytestream - s->bytestream_start;
the_end: the_end:
inflateEnd(&s->zstream); inflateEnd(&s->zstream);
av_freep(&s->crow_buf); av_free(crow_buf_base);
s->crow_buf = NULL;
av_freep(&s->last_row); av_freep(&s->last_row);
av_freep(&s->tmp_row); av_freep(&s->tmp_row);
return ret; return ret;