From f990f6e3f786924e8350a647882c1f8dc48da547 Mon Sep 17 00:00:00 2001
From: Vitor Sessak <vitor1001@gmail.com>
Date: Sun, 28 Mar 2010 09:59:58 +0000
Subject: [PATCH] =?UTF-8?q?Fix=20NUT=20(de)muxer=20warnings:=20CC=20=20=20?=
=?UTF-8?q?=20libavformat/nutdec.o=20libavformat/nutdec.c:=20In=20function?=
=?UTF-8?q?=20=E2=80=98read=5Fseek=E2=80=99:=20libavformat/nutdec.c:862:?=
=?UTF-8?q?=20warning:=20passing=20argument=203=20of=20=E2=80=98av=5Ftree?=
=?UTF-8?q?=5Ffind=E2=80=99=20from=20incompatible=20pointer=20type=20./lib?=
=?UTF-8?q?avutil/tree.h:44:=20note:=20expected=20=E2=80=98int=20(*)(void?=
=?UTF-8?q?=20*,=20const=20void=20*)=E2=80=99=20but=20argument=20is=20of?=
=?UTF-8?q?=20type=20=E2=80=98int=20(*)(struct=20Syncpoint=20*,=20struct?=
=?UTF-8?q?=20Syncpoint=20*)=E2=80=99=20libavformat/nutdec.c:871:=20warnin?=
=?UTF-8?q?g:=20passing=20argument=203=20of=20=E2=80=98av=5Ftree=5Ffind?=
=?UTF-8?q?=E2=80=99=20from=20incompatible=20pointer=20type=20./libavutil/?=
=?UTF-8?q?tree.h:44:=20note:=20expected=20=E2=80=98int=20(*)(void=20*,=20?=
=?UTF-8?q?const=20void=20*)=E2=80=99=20but=20argument=20is=20of=20type=20?=
=?UTF-8?q?=E2=80=98int=20(*)(struct=20Syncpoint=20*,=20struct=20Syncpoint?=
=?UTF-8?q?=20*)=E2=80=99=20libavformat/nutdec.c:879:=20warning:=20passing?=
=?UTF-8?q?=20argument=203=20of=20=E2=80=98av=5Ftree=5Ffind=E2=80=99=20fro?=
=?UTF-8?q?m=20incompatible=20pointer=20type=20./libavutil/tree.h:44:=20no?=
=?UTF-8?q?te:=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?=
=?UTF-8?q?=20CC=20=20=20=20libavformat/nutenc.o=20libavformat/nutenc.c:?=
=?UTF-8?q?=20In=20function=20=E2=80=98write=5Fpacket=E2=80=99:=20libavfor?=
=?UTF-8?q?mat/nutenc.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/nut.c | 6 +++---
libavformat/nut.h | 4 ++--
libavformat/nutdec.c | 9 ++++++---
libavformat/nutenc.c | 3 ++-
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/libavformat/nut.c b/libavformat/nut.c
index 61c588c05aa..9a6a41b21f4 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -47,11 +47,11 @@ int64_t ff_lsb2full(StreamContext *stream, int64_t lsb){
return ((lsb - delta)&mask) + delta;
}
-int ff_nut_sp_pos_cmp(Syncpoint *a, Syncpoint *b){
+int ff_nut_sp_pos_cmp(const Syncpoint *a, const Syncpoint *b){
return ((a->pos - b->pos) >> 32) - ((b->pos - a->pos) >> 32);
}
-int ff_nut_sp_pts_cmp(Syncpoint *a, Syncpoint *b){
+int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b){
return ((a->ts - b->ts) >> 32) - ((b->ts - a->ts) >> 32);
}
@@ -62,7 +62,7 @@ void 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, ff_nut_sp_pos_cmp, &node);
+ av_tree_insert(&nut->syncpoints, sp, (void *) ff_nut_sp_pos_cmp, &node);
if(node){
av_free(sp);
av_free(node);
diff --git a/libavformat/nut.h b/libavformat/nut.h
index 8d9695245c8..ce052dfedf9 100644
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -107,8 +107,8 @@ typedef struct {
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val);
int64_t ff_lsb2full(StreamContext *stream, int64_t lsb);
-int ff_nut_sp_pos_cmp(Syncpoint *a, Syncpoint *b);
-int ff_nut_sp_pts_cmp(Syncpoint *a, Syncpoint *b);
+int ff_nut_sp_pos_cmp(const Syncpoint *a, const Syncpoint *b);
+int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b);
void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
void ff_nut_free_sp(NUTContext *nut);
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 6e0f1fcf978..d08683f54ab 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;
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index e06a85f54fb..84ea29024eb 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -677,7 +677,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){
}
if(dummy.pos == INT64_MAX)
dummy.pos= 0;
- 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);
nut->last_syncpoint_pos= url_ftell(bc);
ret = url_open_dyn_buf(&dyn_bc);
--
GitLab