[FFmpeg-cvslog] r22662 - trunk/libavformat/nutdec.c

vitor subversion
Wed Mar 24 23:44:06 CET 2010


Author: vitor
Date: Wed Mar 24 23:44:06 2010
New Revision: 22662

Log:
Fix warnings in NUT demuxer:

libavformat/nutdec.c: In function ?read_seek?:
libavformat/nutdec.c:862: warning: passing argument 4 of ?av_tree_find? from incompatible pointer type
./libavutil/tree.h:44: note: expected ?void **? but argument is of type ?struct Syncpoint **?
libavformat/nutdec.c:871: warning: passing argument 4 of ?av_tree_find? from incompatible pointer type
./libavutil/tree.h:44: note: expected ?void **? but argument is of type ?struct Syncpoint **?

Modified:
   trunk/libavformat/nutdec.c

Modified: trunk/libavformat/nutdec.c
==============================================================================
--- trunk/libavformat/nutdec.c	Wed Mar 24 23:38:48 2010	(r22661)
+++ trunk/libavformat/nutdec.c	Wed Mar 24 23:44:06 2010	(r22662)
@@ -859,7 +859,7 @@ static int read_seek(AVFormatContext *s,
         pos2= st->index_entries[index].pos;
         ts  = st->index_entries[index].timestamp;
     }else{
-        av_tree_find(nut->syncpoints, &dummy, ff_nut_sp_pts_cmp, next_node);
+        av_tree_find(nut->syncpoints, &dummy, 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 +868,7 @@ static int read_seek(AVFormatContext *s,
         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, next_node);
+            av_tree_find(nut->syncpoints, &dummy, 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)



More information about the ffmpeg-cvslog mailing list