diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-17 14:55:22 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-17 14:55:22 +0000 |
| commit | 6c9fb32ae47678ca1025d92f30926015d5e8a9ad (patch) | |
| tree | a94997131ba7bc8074fad5f5be4686e7df7eebce | |
| parent | bf6d41d8a233368a2ef7b56cbb762db95c799e2a (diff) | |
| parent | 09e431b9e3674804172e7b0a0f865b65ec09739a (diff) | |
| download | ffmpeg-6c9fb32ae47678ca1025d92f30926015d5e8a9ad.tar.gz | |
Merge commit '09e431b9e3674804172e7b0a0f865b65ec09739a'
* commit '09e431b9e3674804172e7b0a0f865b65ec09739a':
movenc: Assume streams starting at pts=0 for discontinuous fragments with editlists
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavformat/movenc.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 53e3772c61..363501b759 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4486,10 +4486,18 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if (trk->start_dts == AV_NOPTS_VALUE) { trk->start_dts = pkt->dts; if (trk->frag_discont) { - /* Pretend the whole stream started at dts=0, with earlier fragments - * already written, with a duration summing up to pkt->dts. */ - trk->frag_start = pkt->dts; - trk->start_dts = 0; + if (mov->use_editlist) { + /* Pretend the whole stream started at pts=0, with earlier fragments + * already written. If the stream started at pts=0, the duration sum + * of earlier fragments would have been pkt->pts. */ + trk->frag_start = pkt->pts; + trk->start_dts = pkt->dts - pkt->pts; + } else { + /* Pretend the whole stream started at dts=0, with earlier fragments + * already written, with a duration summing up to pkt->dts. */ + trk->frag_start = pkt->dts; + trk->start_dts = 0; + } trk->frag_discont = 0; } else if (pkt->dts && mov->moov_written) av_log(s, AV_LOG_WARNING, |