summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-02-27 18:18:49 +0200
committerUoti Urpala <uau@mplayer2.org>2012-02-27 18:18:49 +0200
commita43a4aafd08650254a4b91fe73f82ec96bf2a6ef (patch)
treea6a1fd4c9630add86b40df14c1f979832e49ff89 /cfg-mplayer.h
parent9ab501443c37888ee0d286897ebb985b2056ba49 (diff)
downloadmpv-a43a4aafd08650254a4b91fe73f82ec96bf2a6ef.tar.bz2
mpv-a43a4aafd08650254a4b91fe73f82ec96bf2a6ef.tar.xz
configure, build: support compiling without libpostproc
libpostproc has been removed from Libav and the library now exists as a separate project. Because it's not essential, separate it from the Libav library check and allow compiling without it.
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index f09cd9edd3..471e3d8505 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[]={
@@ -596,7 +596,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},
@@ -926,7 +928,6 @@ const m_option_t mplayer_opts[]={
OPT_FLAG_ON("list-properties", list_properties, CONF_GLOBAL),
{"identify", &mp_msg_levels[MSGT_IDENTIFY], CONF_TYPE_FLAG, CONF_GLOBAL, 0, MSGL_V, NULL},
- {"-help", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
{"help", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
{"h", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},