vbr audio encode patch by (Justin Ruggles: jruggle, earthlink net)

with changes by me
    int->float as video uses float too
    remove silent cliping to some per codec range, this should result in an error instead
    remove change to utils.c as its inconsistant with video

Originally committed as revision 4533 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 5 insertions, 1 deletions

diff --git a/libavcodec/faac.c b/libavcodec/faac.c
index a65bdefae5..a49cce968f 100644
--- a/libavcodec/faac.c
+++ b/libavcodec/faac.c
@@ -56,7 +56,11 @@ static int Faac_encode_init(AVCodecContext *avctx)
     faac_cfg->mpegVersion = MPEG4;
     faac_cfg->useTns = 0;
     faac_cfg->allowMidside = 1;
-    faac_cfg->bitRate = avctx->bit_rate;
+    faac_cfg->bitRate = avctx->bit_rate / avctx->channels;
+    if(avctx->flags & CODEC_FLAG_QSCALE) {
+        faac_cfg->bitRate = 0;
+        faac_cfg->quantqual = avctx->global_quality / FF_QP2LAMBDA;
+    }
     faac_cfg->outputFormat = 0;
     faac_cfg->inputFormat = FAAC_INPUT_16BIT;