summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-07 11:12:56 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-07 11:12:56 +0000
commit36a0a355987f8619a6a93be5797b3ef9d0141903 (patch)
treea395f43dbac05a650c556f2ba6b5485a7e80bd9e /mplayer.c
parent25f0498660e8c335ddad8aa2019de0e94a2f156b (diff)
downloadmpv-36a0a355987f8619a6a93be5797b3ef9d0141903.tar.bz2
mpv-36a0a355987f8619a6a93be5797b3ef9d0141903.tar.xz
Use switch_program property from mplayer.c to set ts_prog.
This seems to leave the ts demuxer unaffected, but fixes -tsprog with the lavf demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29846 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index 87f5b0b6ab..038d981b00 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3339,6 +3339,10 @@ mpctx->d_audio=mpctx->demuxer->audio;
mpctx->d_video=mpctx->demuxer->video;
mpctx->d_sub=mpctx->demuxer->sub;
+if (ts_prog) {
+ int tmp = ts_prog;
+ mp_property_do("switch_program", M_PROPERTY_SET, &tmp, mpctx);
+}
// select audio stream
select_audio(mpctx->demuxer, audio_id, audio_lang);