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 /mencoder.c | |
| 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 'mencoder.c')
| -rw-r--r-- | mencoder.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |