[MPlayer-cvslog] r29611 - trunk/libmpdemux/demux_demuxers.c

[reimar]

Author: reimar
Date: Tue Sep  1 17:00:49 2009
New Revision: 29611

Log:
Add a hack to ensure data from e.g. mov format -subfile gets read at all

Modified:
   trunk/libmpdemux/demux_demuxers.c

Modified: trunk/libmpdemux/demux_demuxers.c
==============================================================================
--- trunk/libmpdemux/demux_demuxers.c	Tue Sep  1 16:51:49 2009	(r29610)
+++ trunk/libmpdemux/demux_demuxers.c	Tue Sep  1 17:00:49 2009	(r29611)
@@ -73,6 +73,10 @@ static int demux_demuxers_fill_buffer(de
 
   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)