Mercurial > libavformat.hg

comparison nutdec.c @ 5902:dbbcecb1a0dd libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
5901:7028f9476da4 5902:dbbcecb1a0dd
857 return -1; 857 return -1;
858 858
859 pos2= st->index_entries[index].pos; 859 pos2= st->index_entries[index].pos;
860 ts = st->index_entries[index].timestamp; 860 ts = st->index_entries[index].timestamp;
861 }else{ 861 }else{
862 av_tree_find(nut->syncpoints, &dummy, ff_nut_sp_pts_cmp, (void **) next_node); 862 av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pts_cmp,
863 (void **) next_node);
863 av_log(s, AV_LOG_DEBUG, "%"PRIu64"-%"PRIu64" %"PRId64"-%"PRId64"\n", next_node[0]->pos, next_node[1]->pos, 864 av_log(s, AV_LOG_DEBUG, "%"PRIu64"-%"PRIu64" %"PRId64"-%"PRId64"\n", next_node[0]->pos, next_node[1]->pos,
864 next_node[0]->ts , next_node[1]->ts); 865 next_node[0]->ts , next_node[1]->ts);
865 pos= av_gen_search(s, -1, dummy.ts, next_node[0]->pos, next_node[1]->pos, next_node[1]->pos, 866 pos= av_gen_search(s, -1, dummy.ts, next_node[0]->pos, next_node[1]->pos, next_node[1]->pos,
866 next_node[0]->ts , next_node[1]->ts, AVSEEK_FLAG_BACKWARD, &ts, nut_read_timestamp); 867 next_node[0]->ts , next_node[1]->ts, AVSEEK_FLAG_BACKWARD, &ts, nut_read_timestamp);
867 868
868 if(!(flags & AVSEEK_FLAG_BACKWARD)){ 869 if(!(flags & AVSEEK_FLAG_BACKWARD)){
869 dummy.pos= pos+16; 870 dummy.pos= pos+16;
870 next_node[1]= &nopts_sp; 871 next_node[1]= &nopts_sp;
871 av_tree_find(nut->syncpoints, &dummy, ff_nut_sp_pos_cmp, (void **) next_node); 872 av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp,
873 (void **) next_node);
872 pos2= av_gen_search(s, -2, dummy.pos, next_node[0]->pos , next_node[1]->pos, next_node[1]->pos, 874 pos2= av_gen_search(s, -2, dummy.pos, next_node[0]->pos , next_node[1]->pos, next_node[1]->pos,
873 next_node[0]->back_ptr, next_node[1]->back_ptr, flags, &ts, nut_read_timestamp); 875 next_node[0]->back_ptr, next_node[1]->back_ptr, flags, &ts, nut_read_timestamp);
874 if(pos2>=0) 876 if(pos2>=0)
875 pos= pos2; 877 pos= pos2;
876 //FIXME dir but I think it does not matter 878 //FIXME dir but I think it does not matter
877 } 879 }
878 dummy.pos= pos; 880 dummy.pos= pos;
879 sp= av_tree_find(nut->syncpoints, &dummy, ff_nut_sp_pos_cmp, NULL); 881 sp= av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp,
882 NULL);
880 883
881 assert(sp); 884 assert(sp);
882 pos2= sp->back_ptr - 15; 885 pos2= sp->back_ptr - 15;
883 } 886 }
884 av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos2); 887 av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos2);