diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-26 12:48:36 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-26 12:48:36 +0000 |
| commit | 43f8f1925eef4528e8bda0fedd4d0d756c6dcb9e (patch) | |
| tree | 51d09c8c5e0ef17fb553aa43b73dfe46c5ee73d0 | |
| parent | 1c4233bb14ac0d6dc0c9ed3ad7dbb1f2d5628b2f (diff) | |
| download | mpv-43f8f1925eef4528e8bda0fedd4d0d756c6dcb9e.tar.bz2 mpv-43f8f1925eef4528e8bda0fedd4d0d756c6dcb9e.tar.xz | |
eviv bulgroz <ebulgroz@yahoo.com>:
The folllowing patch fixes 2 minor problems in lameopts presets
- prints an error message when fast/preset is used with an mplayer built
without these options.
- small fix in manpage
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8569 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/mplayer.1 | 2 | ||||
| -rw-r--r-- | cfg-mencoder.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1 index 2fd68aa6fc..42b50079a3 100644 --- a/DOCS/mplayer.1 +++ b/DOCS/mplayer.1 @@ -2123,7 +2123,7 @@ set audio input gain .IPs fast switch on faster encoding on subsequent VBR presets modes, slightly lower quality and higher bitrates. -.IPs preset +.IPs preset=<value> provide the highest possible quality settings. .RSss medium: VBR encoding, good quality, 150\-180 kbps bitrate range. diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 480fc96dab..37660d38a1 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -34,6 +34,9 @@ struct config lameopts_conf[]={ #if HAVE_MP3LAME >= 392 {"fast", &lame_param_fast, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"preset", &lame_param_preset, CONF_TYPE_STRING, 0, 0, 0, NULL}, +#else + {"fast", "MPlayer was built without -lameopts fast support (requires libmp3lame >=3.92)!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"preset", "MPlayer was built without -lameopts preset support (requires libmp3lame >=3.92)!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif {"help", "TODO: lameopts help!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} |