From 6be4042c528df11c9b1d6c96464042ba048963a2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Sat, 2 Feb 2008 21:38:25 +0000
Subject: [PATCH] Fix warning: libavcodec/tiffenc.c:136: warning: pointer type
 mismatch in conditional expression

Originally committed as revision 11817 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/tiffenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index 5b567ae..69f8e59 100644
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -133,7 +133,7 @@ static void add_entry1(TiffEncoderContext * s,
                        enum TiffTags tag, enum TiffTypes type, int val){
     uint16_t w = val;
     uint32_t dw= val;
-    add_entry(s, tag, type, 1, type == TIFF_SHORT ? &w : &dw);
+    add_entry(s, tag, type, 1, type == TIFF_SHORT ? (void *)&w : (void *)&dw);
 }
 
 /**
-- 
2.7.4