aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-05-12 14:26:55 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-05-12 14:27:01 +0100
commita022c1fe76f3b0cd20336f1092942ffcfa5a4572 (patch)
tree3ccb8ba5803a9564ecdaafe4f243a5b837177eba /libavformat
parenta2906846da10f3277ca857fad43faf18c9b8ca8c (diff)
parent0abb07bad7026a945a31ba4047e6583c8b3fa3da (diff)
downloadffmpeg-a022c1fe76f3b0cd20336f1092942ffcfa5a4572.tar.gz
Merge commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da'
* commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da': movenc: Update a comment to reflect how the code actually behaves Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/movenc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 5acb9aff12..3d62003872 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4581,7 +4581,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
/* We also may have written the pts and the corresponding duration
* in sidx/tfrf/tfxd tags; make sure the sidx pts and duration match up with
* the next fragment. This means the cts of the first sample must
- * be the same in all fragments. */
+ * be the same in all fragments, unless end_pts was updated by
+ * the packet causing the fragment to be written. */
if ((mov->flags & FF_MOV_FLAG_DASH && !(mov->flags & FF_MOV_FLAG_GLOBAL_SIDX)) ||
mov->mode == MODE_ISM)
pkt->pts = pkt->dts + trk->end_pts - trk->cluster[trk->entry].dts;