diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-11 09:48:36 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-11 09:48:36 +0000 |
| commit | 4bec93423475a1f698cc75f64a749bd369fa01a1 (patch) | |
| tree | 5b3de4fa894ee57ca740503d02501aa5e42551fd /cfg-mplayer.h | |
| parent | 196310b250e66a3a82efbd4152144f83af08e8b6 (diff) | |
| download | mpv-4bec93423475a1f698cc75f64a749bd369fa01a1.tar.bz2 mpv-4bec93423475a1f698cc75f64a749bd369fa01a1.tar.xz | |
Split cfg-common.h into two separate header files. It was being included twice
with different definitions set that activated either the lower or the upper
half of the header. The effectively simulated using two different header files.
It is more straightforward to split the header instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26392 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index afd6558e40..a8a6e25515 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -354,10 +354,8 @@ const m_option_t mplayer_opts[]={ {"tvscan", "MPlayer was compiled without TV interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif /* USE_TV */ -#define MAIN_CONF -#include "cfg-common.h" -#undef MAIN_CONF - +#include "cfg-common-opts.h" + {"list-properties", &list_properties, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"identify", &mp_msg_levels[MSGT_IDENTIFY], CONF_TYPE_FLAG, CONF_GLOBAL, 0, MSGL_V, NULL}, {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, |