diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2008-02-02 21:38:25 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2008-02-02 21:38:25 +0000 |
| commit | 6be4042c528df11c9b1d6c96464042ba048963a2 (patch) | |
| tree | 1f388efef84803a3c39151c2cba3a992d20c5c15 | |
| parent | 6c51fd3f2bc1dd9fd39e79fb24d6f3ed68372c2a (diff) | |
| download | ffmpeg-6be4042c528df11c9b1d6c96464042ba048963a2.tar.gz | |
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
| -rw-r--r-- | libavcodec/tiffenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 5b567aeec6..69f8e59f68 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); } /** |