Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

movenc: Factorize a function for finishing a written fragment

Browse source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2014-11-02 00:21:01 +02:00
parent 0b67c83b2e
commit 4b8ddf71dc
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libavformat/movenc.c
View file

@ -5994,6 +5994,16 @@ static int mov_write_squashed_packets(AVFormatContext *s)
return 0;
}
static int mov_finish_fragment(MOVTrack *track)
{
if (!track->entry)
return 0;
track->entry = 0;
track->entries_flushed = 0;
track->end_reliable = 0;
return 0;
}
static int mov_flush_fragment(AVFormatContext *s, int force)
{
MOVMuxContext *mov = s->priv_data;
@ -6103,10 +6113,8 @@ static int mov_flush_fragment(AVFormatContext *s, int force)
mov->moov_written = 1;
mov->mdat_size = 0;
for (i = 0; i < mov->nb_tracks; i++) {
mov->tracks[i].entry = 0;
mov->tracks[i].end_reliable = 0;
}
for (i = 0; i < mov->nb_tracks; i++)
mov_finish_fragment(&mov->tracks[i]);
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT);
return 0;
}
@ -6177,9 +6185,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force)
ffio_wfourcc(s->pb, "mdat");
}
track->entry = 0;
track->entries_flushed = 0;
track->end_reliable = 0;
mov_finish_fragment(&mov->tracks[i]);
if (!mov->frag_interleave) {
if (!track->mdat_buf)
continue;