Mercurial > mplayer.hg

changeset 29569:3e13839031b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a hack to ensure data from e.g. mov format -subfile gets read at all
author reimar
date Tue, 01 Sep 2009 15:00:49 +0000
parents ccb7b7f4b764
children eb2567b65311
files libmpdemux/demux_demuxers.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_demuxers.c	Tue Sep 01 14:51:49 2009 +0000
+++ b/libmpdemux/demux_demuxers.c	Tue Sep 01 15:00:49 2009 +0000
@@ -73,6 +73,10 @@
 
   priv=demux->priv;
 
+  // HACK: make sure the subtitles get properly interleaved if with -subfile
+  if (priv->sd && priv->sd->sub != ds &&
+      priv->sd != priv->vd && priv->sd != priv->ad)
+    ds_get_next_pts(priv->sd->sub);
   if(priv->vd && priv->vd->video == ds)
     return demux_fill_buffer(priv->vd,ds);
   else if(priv->ad && priv->ad->audio == ds)