diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-14 17:17:04 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:10:47 +0200 |
| commit | 53bb25e2e733a2a6756b3ec7e4ab549cabab40c8 (patch) | |
| tree | a949847a09cf701a98b44fb8ff3055aa429b51d8 /cfg-mplayer.h | |
| parent | 5d7f80c68b77454ac950f2a24b6110e36c29e7c7 (diff) | |
| download | mpv-53bb25e2e733a2a6756b3ec7e4ab549cabab40c8.tar.bz2 mpv-53bb25e2e733a2a6756b3ec7e4ab549cabab40c8.tar.xz | |
cfg-common*: Replace common options template by a common options array
This solution works just as well, but avoids a separate template file
that needs to be #included from multiple places. The end result is
simpler since common options and those of MPlayer and MEncoder are now
in only one file each.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31434 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index dc1cb63ac9..f8b57d280f 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -26,7 +26,6 @@ #include <stddef.h> #include "cfg-common.h" -#include "libmpdemux/demux_ts.h" #include "libvo/vo_zr.h" #include "options.h" @@ -50,9 +49,6 @@ extern char *unrar_executable; extern const m_option_t dxr2_opts[]; -extern int sws_flags; -extern char* pp_help; - const m_option_t vd_conf[]={ {"help", "Use MPlayer with an appropriate video file instead of live partners to avoid vd.\n", CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} @@ -353,8 +349,6 @@ const m_option_t mplayer_opts[]={ {"tvscan", "MPlayer was compiled without TV interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif /* CONFIG_TV */ -#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", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, |