From f990f6e3f786924e8350a647882c1f8dc48da547 Mon Sep 17 00:00:00 2001 From: Vitor Sessak Date: Sun, 28 Mar 2010 09:59:58 +0000 Subject: =?UTF-8?q?Fix=20NUT=20(de)muxer=20warnings:=20CC=20=20=20=20libav?= =?UTF-8?q?format/nutdec.o=20libavformat/nutdec.c:=20In=20function=20?= =?UTF-8?q?=E2=80=98read=5Fseek=E2=80=99:=20libavformat/nutdec.c:862:=20wa?= =?UTF-8?q?rning:=20passing=20argument=203=20of=20=E2=80=98av=5Ftree=5Ffin?= =?UTF-8?q?d=E2=80=99=20from=20incompatible=20pointer=20type=20./libavutil?= =?UTF-8?q?/tree.h:44:=20note:=20expected=20=E2=80=98int=20(*)(void=20*,?= =?UTF-8?q?=20const=20void=20*)=E2=80=99=20but=20argument=20is=20of=20type?= =?UTF-8?q?=20=E2=80=98int=20(*)(struct=20Syncpoint=20*,=20struct=20Syncpo?= =?UTF-8?q?int=20*)=E2=80=99=20libavformat/nutdec.c:871:=20warning:=20pass?= =?UTF-8?q?ing=20argument=203=20of=20=E2=80=98av=5Ftree=5Ffind=E2=80=99=20?= =?UTF-8?q?from=20incompatible=20pointer=20type=20./libavutil/tree.h:44:?= =?UTF-8?q?=20note:=20expected=20=E2=80=98int=20(*)(void=20*,=20const=20vo?= =?UTF-8?q?id=20*)=E2=80=99=20but=20argument=20is=20of=20type=20=E2=80=98i?= =?UTF-8?q?nt=20(*)(struct=20Syncpoint=20*,=20struct=20Syncpoint=20*)?= =?UTF-8?q?=E2=80=99=20libavformat/nutdec.c:879:=20warning:=20passing=20ar?= =?UTF-8?q?gument=203=20of=20=E2=80=98av=5Ftree=5Ffind=E2=80=99=20from=20i?= =?UTF-8?q?ncompatible=20pointer=20type=20./libavutil/tree.h:44:=20note:?= =?UTF-8?q?=20expected=20=E2=80=98int=20(*)(void=20*,=20const=20void=20*)?= =?UTF-8?q?=E2=80=99=20but=20argument=20is=20of=20type=20=E2=80=98int=20(*?= =?UTF-8?q?)(struct=20Syncpoint=20*,=20struct=20Syncpoint=20*)=E2=80=99=20?= =?UTF-8?q?CC=20=20=20=20libavformat/nutenc.o=20libavformat/nutenc.c:=20In?= =?UTF-8?q?=20function=20=E2=80=98write=5Fpacket=E2=80=99:=20libavformat/n?= =?UTF-8?q?utenc.c:680:=20warning:=20passing=20argument=203=20of=20?= =?UTF-8?q?=E2=80=98av=5Ftree=5Ffind=E2=80=99=20from=20incompatible=20poin?= =?UTF-8?q?ter=20type=20./libavutil/tree.h:44:=20note:=20expected=20?= =?UTF-8?q?=E2=80=98int=20(*)(void=20*,=20const=20void=20*)=E2=80=99=20but?= =?UTF-8?q?=20argument=20is=20of=20type=20=E2=80=98int=20(*)(struct=20Sync?= =?UTF-8?q?point=20*,=20struct=20Syncpoint=20*)=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originally committed as revision 22707 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/nutdec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libavformat/nutdec.c') diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 6e0f1fc..d08683f 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -859,7 +859,8 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flag pos2= st->index_entries[index].pos; ts = st->index_entries[index].timestamp; }else{ - av_tree_find(nut->syncpoints, &dummy, ff_nut_sp_pts_cmp, (void **) next_node); + av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pts_cmp, + (void **) next_node); av_log(s, AV_LOG_DEBUG, "%"PRIu64"-%"PRIu64" %"PRId64"-%"PRId64"\n", next_node[0]->pos, next_node[1]->pos, next_node[0]->ts , next_node[1]->ts); pos= av_gen_search(s, -1, dummy.ts, next_node[0]->pos, next_node[1]->pos, next_node[1]->pos, @@ -868,7 +869,8 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flag if(!(flags & AVSEEK_FLAG_BACKWARD)){ dummy.pos= pos+16; next_node[1]= &nopts_sp; - av_tree_find(nut->syncpoints, &dummy, ff_nut_sp_pos_cmp, (void **) next_node); + av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp, + (void **) next_node); pos2= av_gen_search(s, -2, dummy.pos, next_node[0]->pos , next_node[1]->pos, next_node[1]->pos, next_node[0]->back_ptr, next_node[1]->back_ptr, flags, &ts, nut_read_timestamp); if(pos2>=0) @@ -876,7 +878,8 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flag //FIXME dir but I think it does not matter } dummy.pos= pos; - sp= av_tree_find(nut->syncpoints, &dummy, ff_nut_sp_pos_cmp, NULL); + sp= av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp, + NULL); assert(sp); pos2= sp->back_ptr - 15; -- cgit v1.1