diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 78ff4ee8ac..b792a3b58e 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3635,7 +3635,10 @@ static int mov_write_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);
             }
         }