kill warnings

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

1 files changed, 4 insertions, 3 deletions

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index fca45898de..97f4c73987 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -155,7 +155,8 @@ static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t
     int tag, type, count, off, value = 0;
     uint8_t *src, *dst;
     int i, j, ssize, soff, stride;
-    int *pal, *rp, *gp, *bp;
+    int *pal;
+    uint8_t *rp, *gp, *bp;
 
     tag = tget_short(&buf, s->le);
     type = tget_short(&buf, s->le);
@@ -244,7 +245,7 @@ static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t
         }
         if(s->bpp == 8){
             /* make default grayscale pal */
-            pal = s->picture.data[1];
+            pal = (int *) s->picture.data[1];
             for(i = 0; i < 256; i++)
                 pal[i] = i * 0x010101;
         }
@@ -377,7 +378,7 @@ static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t
             av_log(s->avctx, AV_LOG_ERROR, "Palette met but this is not palettized format\n");
             return -1;
         }
-        pal = s->picture.data[1];
+        pal = (int *) s->picture.data[1];
         off = type_sizes[type];
         rp = buf;
         gp = buf + count / 3 * off;