summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-13 14:36:38 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-13 14:36:38 +0000
commit2acbece5fb204a559ad95c8d0895811698443e8f (patch)
tree97d50430434257b80092518f5cb55d432830da34 /mencoder.c
parent1de7fb056bac0a4883fb22ddbaeda4aec70e8b0e (diff)
downloadmpv-2acbece5fb204a559ad95c8d0895811698443e8f.tar.bz2
mpv-2acbece5fb204a559ad95c8d0895811698443e8f.tar.xz
Add -tsprog support for lavf to mencoder, similar to what SVN r29846 did for mplayer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29910 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c
index 376aa9b1a1..c823f3349a 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -552,6 +552,14 @@ if(stream->type==STREAMTYPE_DVDNAV){
mencoder_exit(1,NULL);
}
+ if (ts_prog) {
+ demux_program_t prog = { .progid = ts_prog };
+ if (demux_control(demuxer, DEMUXER_CTRL_IDENTIFY_PROGRAM, &prog) != DEMUXER_CTRL_NOTIMPL) {
+ audio_id = prog.aid; // switching is handled by select_audio below
+ video_id = prog.vid;
+ demuxer_switch_video(demuxer, video_id);
+ }
+ }
select_audio(demuxer, audio_id, audio_lang);
if (dvdsub_id == -1 && dvdsub_lang)