Mercurial > mplayer.hg

diff mencoder.c @ 36682:68794f2fbf1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for default of multiple video tracks. Some container formats like matroska support multiple video tracks, one of which may be flagged the 'default' one which thus should be played by default. Works with the lavf demuxer.
author ib
date Sun, 02 Feb 2014 19:18:31 +0000
parents 805ff0c5b699
children 3f213bf6a8a2
line wrap: on
line diff
--- a/mencoder.c	Sun Feb 02 10:54:37 2014 +0000
+++ b/mencoder.c	Sun Feb 02 19:18:31 2014 +0000
@@ -709,10 +709,10 @@
     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);
+      video_id = prog.vid; // switching is handled by select_video below
     }
   }
+  select_video(demuxer, video_id);
   select_audio(demuxer, audio_id, audio_lang);
 
   if (dvdsub_id == -1 && dvdsub_lang)