[Ffmpeg-cvslog] CVS: ffmpeg/libavformat avidec.c,1.81,1.82

Michael Niedermayer CVS michael
Wed Mar 1 12:41:18 CET 2006


Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv9582

Modified Files:
	avidec.c 
Log Message:
add movi_list offset into index


Index: avidec.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avidec.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- avidec.c	1 Mar 2006 11:29:55 -0000	1.81
+++ avidec.c	1 Mar 2006 11:41:16 -0000	1.82
@@ -467,7 +467,7 @@
 //        av_log(NULL, AV_LOG_DEBUG, "%d\n", i);
         if(i>=0){
             int64_t pos= best_st->index_entries[i].pos;
-            pos += avi->movi_list + best_ast->packet_size - best_ast->remaining;
+            pos += best_ast->packet_size - best_ast->remaining;
             url_fseek(&s->pb, pos, SEEK_SET);
 //        av_log(NULL, AV_LOG_DEBUG, "pos=%Ld\n", pos);
 
@@ -689,6 +689,7 @@
 #endif
         if(i==0 && pos > avi->movi_list)
             avi->movi_list= 0; //FIXME better check
+        pos += avi->movi_list;
 
         index = ((tag & 0xff) - '0') * 10;
         index += ((tag >> 8) & 0xff) - '0';
@@ -838,7 +839,6 @@
     if (avi->dv_demux)
         dv_flush_audio_packets(avi->dv_demux);
     /* do the seek */
-    pos += avi->movi_list;
     url_fseek(&s->pb, pos, SEEK_SET);
     avi->stream_index= -1;
     return 0;





More information about the ffmpeg-cvslog mailing list