# HG changeset patch
# User al
# Date 1343950084 0
# Node ID 0ba5ba56f6d070d80b4b2aba2d8f90e649a0459e
# Parent  8446e92c7bc2abee80e22a734f4ad8cd53319ee4
demux_lavf: Set endpts from AVPacket.duration

  Always set endpts from AVPacket.duration for all streams. Override
endpts with AVPacket.convergence_duration for subtitle streams if it
is non-zero, because some lavf demuxers store the duration there.
However keep the behaviour to never set endpts if it would equal pts
afterwards.

  Also stop checking AV_PKT_FLAG_KEY when overriding endpts with
convergence_duration. It does not seem necessary anymore.

diff -r 8446e92c7bc2 -r 0ba5ba56f6d0 libmpdemux/demux_lavf.c
--- a/libmpdemux/demux_lavf.c	Sun Jul 29 19:50:30 2012 +0000
+++ b/libmpdemux/demux_lavf.c	Thu Aug 02 23:28:04 2012 +0000
@@ -651,10 +651,10 @@
     if(pkt.pts != AV_NOPTS_VALUE){
         dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base);
         priv->last_pts= dp->pts * AV_TIME_BASE;
-        // always set endpts for subtitles, even if AV_PKT_FLAG_KEY is not set,
-        // otherwise they will stay on screen to long if e.g. ASS is demuxed from mkv
-        if((ds == demux->sub || (pkt.flags & AV_PKT_FLAG_KEY)) &&
-           pkt.convergence_duration > 0)
+        if(pkt.duration > 0)
+            dp->endpts = dp->pts + pkt.duration * av_q2d(priv->avfc->streams[id]->time_base);
+        /* subtitle durations are sometimes stored in convergence_duration */
+        if(ds == demux->sub && pkt.convergence_duration > 0)
             dp->endpts = dp->pts + pkt.convergence_duration * av_q2d(priv->avfc->streams[id]->time_base);
     }
     dp->pos=demux->filepos;