Mercurial > libavformat.hg
diff nutdec.c @ 5902:dbbcecb1a0dd libavformat
Fix NUT (de)muxer warnings:
CC libavformat/nutdec.o
libavformat/nutdec.c: In function ¡Æread_seek¡Ç:
libavformat/nutdec.c:862: warning: passing argument 3 of ¡Æav_tree_find¡Ç from incompatible pointer type
./libavutil/tree.h:44: note: expected ¡Æint (*)(void *, const void *)¡Ç but argument is of type ¡Æint (*)(struct Syncpoint *, struct Syncpoint *)¡Ç
libavformat/nutdec.c:871: warning: passing argument 3 of ¡Æav_tree_find¡Ç from incompatible pointer type
./libavutil/tree.h:44: note: expected ¡Æint (*)(void *, const void *)¡Ç but argument is of type ¡Æint (*)(struct Syncpoint *, struct Syncpoint *)¡Ç
libavformat/nutdec.c:879: warning: passing argument 3 of ¡Æav_tree_find¡Ç from incompatible pointer type
./libavutil/tree.h:44: note: expected ¡Æint (*)(void *, const void *)¡Ç but argument is of type ¡Æint (*)(struct Syncpoint *, struct Syncpoint *)¡Ç
CC libavformat/nutenc.o
libavformat/nutenc.c: In function ¡Æwrite_packet¡Ç:
libavformat/nutenc.c:680: warning: passing argument 3 of ¡Æav_tree_find¡Ç from incompatible pointer type
./libavutil/tree.h:44: note: expected ¡Æint (*)(void *, const void *)¡Ç but argument is of type ¡Æint (*)(struct Syncpoint *, struct Syncpoint *)¡Ç
author | vitor |
---|---|
date | Sun, 28 Mar 2010 09:59:58 +0000 |
parents | fd67c6b9f915 |
children | b8041f85c327 |
line wrap: on
line diff
--- a/nutdec.c Sun Mar 28 08:48:45 2010 +0000 +++ b/nutdec.c Sun Mar 28 09:59:58 2010 +0000 @@ -859,7 +859,8 @@ 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 @@ 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 @@ //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;