Mercurial > mplayer.hg
comparison mencoder.c @ 29868:7ccde024713a
Add -tsprog support for lavf to mencoder, similar to what SVN r29846 did for mplayer.
author | reimar |
---|---|
date | Fri, 13 Nov 2009 14:36:38 +0000 |
parents | b5e23411a51e |
children | 3a3370c00ba6 |
comparison
equal
deleted
inserted
replaced
29867:a8e0b5425393 | 29868:7ccde024713a |
---|---|
550 mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_FormatNotRecognized); | 550 mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_FormatNotRecognized); |
551 mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_CannotOpenDemuxer); | 551 mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_CannotOpenDemuxer); |
552 mencoder_exit(1,NULL); | 552 mencoder_exit(1,NULL); |
553 } | 553 } |
554 | 554 |
555 if (ts_prog) { | |
556 demux_program_t prog = { .progid = ts_prog }; | |
557 if (demux_control(demuxer, DEMUXER_CTRL_IDENTIFY_PROGRAM, &prog) != DEMUXER_CTRL_NOTIMPL) { | |
558 audio_id = prog.aid; // switching is handled by select_audio below | |
559 video_id = prog.vid; | |
560 demuxer_switch_video(demuxer, video_id); | |
561 } | |
562 } | |
555 select_audio(demuxer, audio_id, audio_lang); | 563 select_audio(demuxer, audio_id, audio_lang); |
556 | 564 |
557 if (dvdsub_id == -1 && dvdsub_lang) | 565 if (dvdsub_id == -1 && dvdsub_lang) |
558 dvdsub_id = demuxer_sub_track_by_lang(demuxer, dvdsub_lang); | 566 dvdsub_id = demuxer_sub_track_by_lang(demuxer, dvdsub_lang); |
559 | 567 |