[FFmpeg-cvslog] Merge commit '74383def8f46805faf3391c98516b248108a9a6b'

[Derek Buitenhuis]

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

Merge commit '74383def8f46805faf3391c98516b248108a9a6b'

* commit '74383def8f46805faf3391c98516b248108a9a6b':
  movenc: Handle pts == NOPTS when autoflushing

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

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

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

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 3d62003..0186c4f 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4721,7 +4721,10 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt)
                 // 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;
-                trk->end_pts = pkt->pts;
+                if (pkt->pts != AV_NOPTS_VALUE)
+                    trk->end_pts = pkt->pts;
+                else
+                    trk->end_pts = pkt->dts;
                 mov_auto_flush_fragment(s, 0);
             }
         }


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