diff options
author | Clément Bœsch <ubitux@gmail.com> | 2010-11-11 15:24:17 +0100 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-11 16:31:46 +0200 |
commit | 6526bee39b2eed8b6567e9e9046d2ecbeacc7d66 (patch) | |
tree | f648dd2d29599da41170e79e19b7093b79d0b329 /mplayer.c | |
parent | 3283ba0ccbd010a348abde94e894d746d7bf32e4 (diff) | |
download | mpv-6526bee39b2eed8b6567e9e9046d2ecbeacc7d66.tar.bz2 mpv-6526bee39b2eed8b6567e9e9046d2ecbeacc7d66.tar.xz |
options: move some demux options to option struct
Following options were moved: audiofile, audiofile-cache, subfile,
demuxer, audio-demuxer, sub-demuxer, [no]extbased.
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -303,11 +303,6 @@ char **video_codec_list=NULL; // override video codec char **audio_fm_list=NULL; // override audio codec family char **video_fm_list=NULL; // override video codec family -// demuxer: -extern char *demuxer_name; // override demuxer -extern char *audio_demuxer_name; // override audio demuxer -extern char *sub_demuxer_name; // override sub demuxer - // this dvdsub_id was selected via slang // use this to allow dvdnav to follow -slang across stream resets, // in particular the subtitle ID for a language changes @@ -3328,9 +3323,9 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ opt_exit = 1; } #endif - if((demuxer_name && strcmp(demuxer_name,"help")==0) || - (audio_demuxer_name && strcmp(audio_demuxer_name,"help")==0) || - (sub_demuxer_name && strcmp(sub_demuxer_name,"help")==0)){ + if((opts->demuxer_name && strcmp(opts->demuxer_name,"help")==0) || + (opts->audio_demuxer_name && strcmp(opts->audio_demuxer_name,"help")==0) || + (opts->sub_demuxer_name && strcmp(opts->sub_demuxer_name,"help")==0)){ demuxer_help(); mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); opt_exit = 1; |