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-mencoder.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-mencoder.h')
-rw-r--r-- | cfg-mencoder.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 37ba6c05d6..02473ef00b 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -24,12 +24,8 @@ */ #include "libmpcodecs/ve_x264.h" -#include "libmpdemux/demux_ts.h" #include "cfg-common.h" -extern int sws_flags; -extern char *pp_help; - extern const m_option_t faacopts_conf[]; extern const m_option_t lameopts_conf[]; extern const m_option_t lavcopts_conf[]; @@ -273,8 +269,6 @@ const m_option_t mencoder_opts[]={ {"lavfopts", lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif -#include "cfg-common-opts.h" - // {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, // {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, // {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |