Make PNG produce correct 8-bit pictures

Originally committed as revision 6689 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/png.c b/libavcodec/png.c
index 0dd9eae..6d588c3 100644 (file)
--- a/libavcodec/png.c
+++ b/libavcodec/png.c
@@ -850,7 +850,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
         for(i = 0; i < 256; i++) {
             v = palette[i];
             alpha = v >> 24;
-            if (alpha != 0xff)
+            if (alpha && alpha != 0xff)
                 has_alpha = 1;
             *alpha_ptr++ = alpha;
             ptr[0] = v >> 16;