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

1 files changed, 1 insertions, 0 deletions

diff --git a/mplayer.c b/mplayer.c
index 067971f2dd..ad25bd9cbd 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3141,6 +3141,7 @@ int i;
   // Create the config context and register the options
   mpctx->mconfig = m_config_new(opts, cfg_include);
   m_config_register_options(mpctx->mconfig,mplayer_opts);
+  m_config_register_options(mpctx->mconfig, common_opts);
   mp_input_register_options(mpctx->mconfig);
 
   // Preparse the command line