diff options
author | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
commit | 8dc0743571630a08fd40fa88aa09b12b4ce65bf2 (patch) | |
tree | e1c4465768635d77954b5fd21ae726444ee4f48a /cfg-mplayer.h | |
parent | aebdf4f153438497b9310bd1417b5216f07e043b (diff) | |
parent | afecdb681bed81b5df0ed18a300c68be603dfdf9 (diff) | |
download | mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.bz2 mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.xz |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
mplayer.c
screenshot.c
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r-- | cfg-mplayer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index a8f485c7c9..790a1d1503 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -86,7 +86,7 @@ extern int audio_substream_id; extern off_t ps_probe; extern int sws_flags; -extern char* pp_help; +extern const char pp_help[]; #ifdef CONFIG_RADIO const m_option_t radioopts_conf[]={ @@ -599,7 +599,9 @@ const m_option_t common_opts[] = { // postprocessing: {"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL}, +#ifdef CONFIG_LIBPOSTPROC {"pphelp", &pp_help, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, +#endif // scaling: {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL}, |