generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/movenc: fix DELAY_MOOV

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-03 17:24:55 +01:00
parent 00f9e51a26
commit 0daf60140b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/movenc.c
View File

@ -2407,10 +2407,11 @@ static int mov_write_trak_tag(AVIOContext *pb, MOVMuxContext *mov,
{ {
int64_t pos = avio_tell(pb); int64_t pos = avio_tell(pb);
int entry_backup = track->entry; int entry_backup = track->entry;
int chunk_backup = track->chunkCount;
/* If we want to have an empty moov, but some samples already have been /* If we want to have an empty moov, but some samples already have been
* buffered (delay_moov), pretend that no samples have been written yet. */ * buffered (delay_moov), pretend that no samples have been written yet. */
if (mov->flags & FF_MOV_FLAG_EMPTY_MOOV) if (mov->flags & FF_MOV_FLAG_EMPTY_MOOV)
track->entry = 0; track->chunkCount = track->entry = 0;
avio_wb32(pb, 0); /* size */ avio_wb32(pb, 0); /* size */
ffio_wfourcc(pb, "trak"); ffio_wfourcc(pb, "trak");
@ -2446,6 +2447,7 @@ static int mov_write_trak_tag(AVIOContext *pb, MOVMuxContext *mov,
} }
mov_write_track_udta_tag(pb, mov, st); mov_write_track_udta_tag(pb, mov, st);
track->entry = entry_backup; track->entry = entry_backup;
track->chunkCount = chunk_backup;
return update_size(pb, pos); return update_size(pb, pos);
} }