From 53bb25e2e733a2a6756b3ec7e4ab549cabab40c8 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Jun 2010 17:17:04 +0000 Subject: 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 --- mencoder.c | 1 + 1 file changed, 1 insertion(+) (limited to 'mencoder.c') diff --git a/mencoder.c b/mencoder.c index 47f9979b0e..2c4f203317 100644 --- a/mencoder.c +++ b/mencoder.c @@ -605,6 +605,7 @@ audio_encoder_t *aencoder = NULL; set_default_mencoder_options(&opts); mconfig = m_config_new(&opts, cfg_include); m_config_register_options(mconfig,mencoder_opts); + m_config_register_options(mconfig, common_opts); // Preparse the command line m_config_preparse_command_line(mconfig,argc,argv); -- cgit v1.2.3