virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

nut: Use correct function pointer casts instead of void*

Browse Source 
Fixes several warnings of the type
libavformat/nut.c:207:42: warning: ISO C forbids conversion of function pointer to object pointer type [-Wpedantic]
This commit is contained in:
Diego Biurrun 2015-10-30 15:27:56 +01:00
parent 3b50dbc51f
commit fcbdd605b5
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/nut.c
View File

@ -204,7 +204,8 @@ int ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts)
sp->pos = pos;
sp->back_ptr = back_ptr;
sp->ts = ts;
av_tree_insert(&nut->syncpoints, sp, (void *) ff_nut_sp_pos_cmp, &node);
av_tree_insert(&nut->syncpoints, sp,
(int (*)(void *, const void *)) ff_nut_sp_pos_cmp, &node);
if (node) {
av_free(sp);
av_free(node);

9
libavformat/nutdec.c
View File

@ -987,7 +987,8 @@ static int read_seek(AVFormatContext *s, int stream_index,
pos2 = st->index_entries[index].pos;
ts = st->index_entries[index].timestamp;
} else {
av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pts_cmp,
av_tree_find(nut->syncpoints, &dummy,
(int (*)(void *, const 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,
@ -1000,7 +1001,8 @@ static int read_seek(AVFormatContext *s, int stream_index,
if (!(flags & AVSEEK_FLAG_BACKWARD)) {
dummy.pos = pos + 16;
next_node[1] = &nopts_sp;
av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp,
av_tree_find(nut->syncpoints, &dummy,
(int (*)(void *, const void *)) ff_nut_sp_pos_cmp,
(void **) next_node);
pos2 = ff_gen_search(s, -2, dummy.pos, next_node[0]->pos,
next_node[1]->pos, next_node[1]->pos,
@ -1011,7 +1013,8 @@ static int read_seek(AVFormatContext *s, int stream_index,
// FIXME dir but I think it does not matter
}
dummy.pos = pos;
sp = av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp,
sp = av_tree_find(nut->syncpoints, &dummy,
(int (*)(void *, const void *)) ff_nut_sp_pos_cmp,
NULL);
assert(sp);

3
libavformat/nutenc.c
View File

@ -807,7 +807,8 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt)
}
if (dummy.pos == INT64_MAX)
dummy.pos = 0;
sp = av_tree_find(nut->syncpoints, &dummy, (void *)ff_nut_sp_pos_cmp,
sp = av_tree_find(nut->syncpoints, &dummy,
(int (*)(void *, const void *)) ff_nut_sp_pos_cmp,
NULL);
nut->last_syncpoint_pos = avio_tell(bc);