summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authoraurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-04 23:34:27 +0000
committeraurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-04 23:34:27 +0000
commit237ae0ac8a4b62585c529defb1e20f360e8f1ed0 (patch)
tree018000a4ed3944db0ad836a62b4e91c3647b45c3 /libmpdemux
parenta0d85f93014e97078cb398d241cb4dca0973d24e (diff)
downloadmpv-237ae0ac8a4b62585c529defb1e20f360e8f1ed0.tar.bz2
mpv-237ae0ac8a4b62585c529defb1e20f360e8f1ed0.tar.xz
lavf: the subtitles display duration is stored in pkt.convergence_duration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27525 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_lavf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 21e53465de..06370ebdc9 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -595,8 +595,8 @@ static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){
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;
- if(pkt.duration)
- dp->endpts = dp->pts + pkt.duration * av_q2d(priv->avfc->streams[id]->time_base);
+ if(pkt.convergence_duration)
+ dp->endpts = dp->pts + pkt.convergence_duration * av_q2d(priv->avfc->streams[id]->time_base);
}
dp->pos=demux->filepos;
dp->flags= !!(pkt.flags&PKT_FLAG_KEY);