projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6c51fd3
)
Fix warning:
author
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sat, 2 Feb 2008 21:38:25 +0000
(21:38 +0000)
committer
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sat, 2 Feb 2008 21:38:25 +0000
(21:38 +0000)
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
patch
|
blob
|
history
diff --git
a/libavcodec/tiffenc.c
b/libavcodec/tiffenc.c
index 5b567aeec6e24a0e3916de43972129ca6d27bfaf..69f8e59f6864d7c25f28c0be3446cae649b5c736 100644
(file)
--- 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);
}
/**