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

[ffmpeg] / libavcodec / png.c

diff --git a/libavcodec/png.c b/libavcodec/png.c
index 079795ab9da241aa40e75d2eb9780642a029b410..11faa866aef8c6719bcc27ec47399428fe6e4480 100644 (file)
--- a/libavcodec/png.c
+++ b/libavcodec/png.c
@@ -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),