Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / tiff.c

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 8d0bb98689d55c24ac63583b1310e88e14618602..1060a4403e26e0e225c4367cc71b60d0a71362cb 100644 (file)
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -313,7 +313,7 @@ static int init_image(TiffContext *s)
             /* make default grayscale pal */
             pal = (uint32_t *) s->picture.data[1];
             for (i = 0; i < 1<<s->bpp; i++)
-                pal[i] = i * 255 / ((1<<s->bpp) - 1) * 0x010101;
+                pal[i] = 0xFF << 24 | i * 255 / ((1<<s->bpp) - 1) * 0x010101;
         }
     }
     return 0;