diff options
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index ac452b19c5..9f7cca9570 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3585,9 +3585,6 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) int64_t frag_duration = 0; int size = pkt->size; - if (!pkt->size) - return 0; /* Discard 0 sized packets */ - if (mov->flags & FF_MOV_FLAG_FRAG_DISCONT) { int i; for (i = 0; i < s->nb_streams; i++) @@ -3595,6 +3592,18 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) mov->flags &= ~FF_MOV_FLAG_FRAG_DISCONT; } + if (!pkt->size) { + if (trk->start_dts == AV_NOPTS_VALUE && trk->frag_discont) { + trk->start_dts = pkt->dts; + if (pkt->pts != AV_NOPTS_VALUE) + trk->start_cts = pkt->pts - pkt->dts; + else + trk->start_cts = 0; + } + + return 0; /* Discard 0 sized packets */ + } + if (trk->entry) frag_duration = av_rescale_q(pkt->dts - trk->cluster[0].dts, s->streams[pkt->stream_index]->time_base, |