diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-01 15:00:49 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-01 15:00:49 +0000 |
| commit | 986499e97ed60c3941d6c1bdd6317dbd86e3da9b (patch) | |
| tree | 490a97a33c082be26b789c4607ef1877a2e88d63 /libmpdemux | |
| parent | 76699d67f0969485e6d1e0ed81f60c406a40a22a (diff) | |
| download | mpv-986499e97ed60c3941d6c1bdd6317dbd86e3da9b.tar.bz2 mpv-986499e97ed60c3941d6c1bdd6317dbd86e3da9b.tar.xz | |
Add a hack to ensure data from e.g. mov format -subfile gets read at all
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29611 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_demuxers.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpdemux/demux_demuxers.c b/libmpdemux/demux_demuxers.c index 5294f3c4d8..4cfc59edb9 100644 --- a/libmpdemux/demux_demuxers.c +++ b/libmpdemux/demux_demuxers.c @@ -73,6 +73,10 @@ static int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds) { 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) |