diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-01 14:42:42 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-01 14:42:42 +0000 |
| commit | 9adb881e61d484467beeee87755f1c512fd5ebcc (patch) | |
| tree | c1583cc48e3b310bedfecc32ad3cfa83d4daade5 | |
| parent | 46a390a5885dc9a9995f876924ed3ee032230acc (diff) | |
| download | mpv-9adb881e61d484467beeee87755f1c512fd5ebcc.tar.bz2 mpv-9adb881e61d484467beeee87755f1c512fd5ebcc.tar.xz | |
fixed bogus overloaded "q" parameter for lame mp3 encoding
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5923 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | cfg-mencoder.h | 1 | ||||
| -rw-r--r-- | mencoder.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index ba8c1116d6..2ac54db7f8 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -23,6 +23,7 @@ extern struct config divx4opts_conf[]; #ifdef HAVE_MP3LAME struct config lameopts_conf[]={ {"q", &lame_param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, + {"aq", &lame_param_algqual, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, {"vbr", &lame_param_vbr, CONF_TYPE_INT, CONF_RANGE, 0, vbr_max_indicator, NULL}, {"cbr", &lame_param_vbr, CONF_TYPE_FLAG, 0, 0, 0, NULL}, {"abr", &lame_param_vbr, CONF_TYPE_FLAG, 0, 0, vbr_abr, NULL}, diff --git a/mencoder.c b/mencoder.c index a5cdb1a831..be7b34cdd5 100644 --- a/mencoder.c +++ b/mencoder.c @@ -181,6 +181,7 @@ float sub_last_pts = -303; #ifdef HAVE_MP3LAME int lame_param_quality=0; // best +int lame_param_algqual=5; // same as old default int lame_param_vbr=vbr_default; int lame_param_mode=-1; // unset int lame_param_padding=-1; // unset @@ -749,12 +750,12 @@ lame_set_bWriteVbrTag(lame,0); lame_set_in_samplerate(lame,sh_audio->samplerate); lame_set_num_channels(lame,mux_a->wf->nChannels); lame_set_out_samplerate(lame,mux_a->wf->nSamplesPerSec); +lame_set_quality(lame,lame_param_algqual); // 0 = best q if(lame_param_vbr){ // VBR: lame_set_VBR(lame,lame_param_vbr); // vbr mode lame_set_VBR_q(lame,lame_param_quality+1); // 1 = best vbr q 6=~128k if(lame_param_br>0) lame_set_VBR_mean_bitrate_kbps(lame,lame_param_br); } else { // CBR: - lame_set_quality(lame,lame_param_quality); // 0 = best q if(lame_param_br>0) lame_set_brate(lame,lame_param_br); } if(lame_param_mode>=0) lame_set_mode(lame,lame_param_mode); // j-st |