mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit 'b81b0cc22b22413760423e239ea644c9afdbfa2d'
* commit 'b81b0cc22b22413760423e239ea644c9afdbfa2d': movenc: Set the last packet duration based on the next packet when autoflushing Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
00ad3432e1
@ -4536,8 +4536,14 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
(mov->flags & FF_MOV_FLAG_FRAG_KEYFRAME &&
|
||||
enc->codec_type == AVMEDIA_TYPE_VIDEO &&
|
||||
trk->entry && pkt->flags & AV_PKT_FLAG_KEY)) {
|
||||
if (frag_duration >= mov->min_fragment_duration)
|
||||
if (frag_duration >= mov->min_fragment_duration) {
|
||||
// Set the duration of this track to line up with the next
|
||||
// sample in this track. This avoids relying on AVPacket
|
||||
// duration, but only helps for this particular track, not
|
||||
// for the other ones that are flushed at the same time.
|
||||
trk->track_duration = pkt->dts - trk->start_dts;
|
||||
mov_auto_flush_fragment(s);
|
||||
}
|
||||
}
|
||||
|
||||
return ff_mov_write_packet(s, pkt);
|
||||
|
Loading…
Reference in New Issue
Block a user