Commit e20815b3 authored by Milan Cutka's avatar Milan Cutka Committed by Michael Niedermayer

When bswap_32 is a macro, png images fail to decode properly, patch by (Milan...

When bswap_32 is a macro, png images fail to decode properly, patch by (Milan Cutka <cutka>at<szm>dot<sk>)

Originally committed as revision 3672 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 788d7a8c
......@@ -501,12 +501,14 @@ static int decode_frame(AVCodecContext *avctx,
if (ret != Z_OK)
return -1;
for(;;) {
int tag32;
if (s->bytestream >= s->bytestream_end)
goto fail;
length = get32(&s->bytestream);
if (length > 0x7fffffff)
goto fail;
tag = bswap_32(get32(&s->bytestream));
tag32 = get32(&s->bytestream);
tag = bswap_32(tag32);
#ifdef DEBUG
printf("png: tag=%c%c%c%c length=%u\n",
(tag & 0xff),
......
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