diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-29 07:20:44 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-29 07:20:44 +0000 |
| commit | f7573d2c0977f65a97d6e09cb4cf75721511dcc5 (patch) | |
| tree | fab2725f558b0fa68c5e29aae9f1c367819a0e6f | |
| parent | a5dfcdf1576f5da33d57469ac939d095e87954fc (diff) | |
| download | mpv-f7573d2c0977f65a97d6e09cb4cf75721511dcc5.tar.bz2 mpv-f7573d2c0977f65a97d6e09cb4cf75721511dcc5.tar.xz | |
libavcodec 2pass broke mencoder if divx4encore was not available. fixed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5391 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | cfg-mencoder.h | 2 | ||||
| -rw-r--r-- | mencoder.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 37d54de603..38661a451a 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -129,10 +129,10 @@ static config_t mencoder_opts[]={ {"ffourcc", &force_fourcc, CONF_TYPE_STRING, 0, 4, 4, NULL}, -#ifdef HAVE_DIVX4ENCORE {"pass", &pass, CONF_TYPE_INT, CONF_RANGE,0,2, NULL}, {"passlogfile", &passtmpfile, CONF_TYPE_STRING, 0, 0, 0, NULL}, +#ifdef HAVE_DIVX4ENCORE {"divx4opts", divx4opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif #ifdef HAVE_MP3LAME diff --git a/mencoder.c b/mencoder.c index 58fc216efe..9c881119a6 100644 --- a/mencoder.c +++ b/mencoder.c @@ -183,11 +183,9 @@ char* ac3_filename=NULL; char *force_fourcc=NULL; -#ifdef HAVE_DIVX4ENCORE static int pass=0; static char* passtmpfile="divx2pass.log"; int pass_working=0; -#endif static int play_n_frames=-1; |