[FFmpeg-cvslog] r25128 - in trunk: configure libavcodec/libmp3lame.c

[cehoyos]

Author: cehoyos
Date: Thu Sep 16 00:10:13 2010
New Revision: 25128

Log:
Allow float values for libmp3lame quality.

Patch by James Darnley, james D darnley A gmail

Modified:
   trunk/configure
   trunk/libavcodec/libmp3lame.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Wed Sep 15 23:36:04 2010	(r25127)
+++ trunk/configure	Thu Sep 16 00:10:13 2010	(r25128)
@@ -2714,7 +2714,7 @@ enabled libdirac   && add_cflags $(pkg-c
                       require  libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac)
 enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
 enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
-enabled libmp3lame && require  libmp3lame lame/lame.h lame_init -lmp3lame
+enabled libmp3lame && require  libmp3lame lame/lame.h hip_decode_init -lmp3lame
 enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut
 enabled libopencore_amrnb  && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
 enabled libopencore_amrwb  && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb

Modified: trunk/libavcodec/libmp3lame.c
==============================================================================
--- trunk/libavcodec/libmp3lame.c	Wed Sep 15 23:36:04 2010	(r25127)
+++ trunk/libavcodec/libmp3lame.c	Thu Sep 16 00:10:13 2010	(r25128)
@@ -61,7 +61,8 @@ static av_cold int MP3lame_encode_init(A
     if(avctx->flags & CODEC_FLAG_QSCALE) {
         lame_set_brate(s->gfp, 0);
         lame_set_VBR(s->gfp, vbr_default);
-        lame_set_VBR_q(s->gfp, avctx->global_quality / (float)FF_QP2LAMBDA);
+        /* requires lame 3.98 or later */
+        lame_set_VBR_quality(s->gfp, avctx->global_quality/(float)FF_QP2LAMBDA);
     }
     lame_set_bWriteVbrTag(s->gfp,0);
     lame_set_disable_reservoir(s->gfp, avctx->flags2 & CODEC_FLAG2_BIT_RESERVOIR ? 0 : 1);