[FFmpeg-cvslog] Merge commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu May 12 14:26:55 2016 +0100| [a022c1fe76f3b0cd20336f1092942ffcfa5a4572] | committer: Derek Buitenhuis

Merge commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da'

* commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da':
  movenc: Update a comment to reflect how the code actually behaves

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a022c1fe76f3b0cd20336f1092942ffcfa5a4572
---

 libavformat/movenc.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 5acb9af..3d62003 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;


======================================================================