highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NUT (de)muxer warnings:

Browse Source 
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 *)’

Originally committed as revision 22707 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak
2010-03-28 09:59:58 +00:00
parent 4c1202f76e
commit f990f6e3f7
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/nutdec.c
View File

@@ -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;