diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 06:54:22 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 07:01:46 +0200 |
| commit | 287b62163eed8811b6cd33716c0691d328947d48 (patch) | |
| tree | 3143d2cb17b32a19e3e7e0aa428210d1bba3eb0b /mencoder.c | |
| parent | 507f4fe6c7811558b1367e4b64855ae7f9bc8da8 (diff) | |
| parent | b411278fbb00767b8013604157a43e0203f66f4c (diff) | |
| download | mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.bz2 mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.xz | |
Merge svn changes up to r29912
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c index 8759053358..9620e2abe3 100644 --- a/mencoder.c +++ b/mencoder.c @@ -559,6 +559,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) { + opts.audio_id = prog.aid; // switching is handled by select_audio below + opts.video_id = prog.vid; + demuxer_switch_video(demuxer, opts.video_id); + } + } select_audio(demuxer, opts.audio_id, audio_lang); if (opts.sub_id < -1 && dvdsub_lang) |