summaryrefslogtreecommitdiffstats
path: root/core/mplayer.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-21 21:17:48 +0200
committerwm4 <wm4@nowhere>2013-07-21 23:27:31 +0200
commitc1afd751428741a2b0077cc82a5fb68c6b672009 (patch)
tree37662fa75aa5b7bdcba04b3fbf6ac4fc33489038 /core/mplayer.c
parent999dad454f6db2c3d52e9594778bccc03156d299 (diff)
downloadmpv-c1afd751428741a2b0077cc82a5fb68c6b672009.tar.bz2
mpv-c1afd751428741a2b0077cc82a5fb68c6b672009.tar.xz
options: use new code for parsing --vo
Nothing should change from user perspective. mpv --vo=opengl:help now works. Remove the vo_opengl inline help text. The new code can list option names for you, but that's it. Refer to the manpage if you have trouble.
Diffstat (limited to 'core/mplayer.c')
-rw-r--r--core/mplayer.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index c2efe82f13..6fdc6edba5 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -700,6 +700,9 @@ static void load_per_output_config(m_config_t *conf, char *cfg, char *out)
char profile[strlen(cfg) + strlen(out) + 1];
m_profile_t *p;
+ if (!out && !out[0])
+ return;
+
sprintf(profile, "%s%s", cfg, out);
p = m_config_get_profile(conf, profile);
if (p) {
@@ -4102,7 +4105,7 @@ static void play_current_file(struct MPContext *mpctx)
if (opts->vo.video_driver_list)
load_per_output_config(mpctx->mconfig, PROFILE_CFG_VO,
- opts->vo.video_driver_list[0]);
+ opts->vo.video_driver_list[0].name);
if (opts->audio_driver_list)
load_per_output_config(mpctx->mconfig, PROFILE_CFG_AO,
opts->audio_driver_list[0]);
@@ -4492,11 +4495,6 @@ static bool handle_help_options(struct MPContext *mpctx)
{
struct MPOpts *opts = &mpctx->opts;
int opt_exit = 0;
- if (opts->vo.video_driver_list &&
- strcmp(opts->vo.video_driver_list[0], "help") == 0) {
- list_video_out();
- opt_exit = 1;
- }
if (opts->audio_driver_list &&
strcmp(opts->audio_driver_list[0], "help") == 0) {
list_audio_out();