[Ffmpeg-cvslog] CVS: ffmpeg/libavformat movenc.c,1.64,1.65

Baptiste Coudurier CVS bcoudurier
Thu Apr 13 15:21:22 CEST 2006


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

Modified Files:
	movenc.c 
Log Message:
write mdat in write_header avoid check in write_packet

Index: movenc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/movenc.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- movenc.c	11 Apr 2006 08:12:54 -0000	1.64
+++ movenc.c	13 Apr 2006 13:21:20 -0000	1.65
@@ -69,7 +69,6 @@
     int     mode;
     int64_t time;
     int     nb_streams;
-    int     mdat_written;
     offset_t mdat_pos;
     long    timescale;
     MOVTrack tracks[MAX_STREAMS];
@@ -1620,6 +1619,9 @@
         mov->tracks[i].mode = mov->mode;
     }
 
+    mov_write_mdat_tag(pb, mov);
+    mov->time = s->timestamp + 0x7C25B080; //1970 based -> 1904 based
+
     put_flush_packet(pb);
 
     return 0;
@@ -1701,11 +1703,6 @@
             return -1;
         trk->ents_allocated += MOV_INDEX_CLUSTER_SIZE;
     }
-    if (mov->mdat_written == 0) {
-        mov_write_mdat_tag(pb, mov);
-        mov->mdat_written = 1;
-        mov->time = s->timestamp + 0x7C25B080; //1970 based -> 1904 based
-    }
 
     trk->cluster[cl][id].pos = url_ftell(pb);
     trk->cluster[cl][id].samplesInChunk = samplesInChunk;





More information about the ffmpeg-cvslog mailing list