git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5270cb3
)
h264: Silence warning: comparison of distinct pointer types lacks a cast
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 23 Feb 2013 13:09:04 +0000
(14:09 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 23 Feb 2013 13:09:04 +0000
(14:09 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264.c
b/libavcodec/h264.c
index
5e9e64f
..
132739f
100644
(file)
--- a/
libavcodec/h264.c
+++ b/
libavcodec/h264.c
@@
-1551,7
+1551,7
@@
static int decode_update_thread_context(AVCodecContext *dst,
memcpy(h, h1, offsetof(H264Context, intra_pcm_ptr));
memcpy(&h->cabac, &h1->cabac,
sizeof(H264Context) - offsetof(H264Context, cabac));
- av_assert0(&h->cabac == &h->mb_padding + 1);
+ av_assert0(
(void*)
&h->cabac == &h->mb_padding + 1);
memset(h->sps_buffers, 0, sizeof(h->sps_buffers));
memset(h->pps_buffers, 0, sizeof(h->pps_buffers));