Merge commit '5d6a990c115850326711c2f5be4d9fd33f399616'

* commit '5d6a990c115850326711c2f5be4d9fd33f399616':
  mpegaudioenc: Remove broken integer-only quantization code path

Conflicts:
	libavcodec/mpegaudioenc.c

Mostly not merged, the integer code works fine.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/mpegaudioenc.c
index 63c8460,b7727ab..b660aca
--- 1/libavcodec/mpegaudioenc.c
--- 2/libavcodec/mpegaudioenc.c
+++ b/libavcodec/mpegaudioenc.c
@@@ -33,8 -33,10 +33,13 @@@
  #define FRAC_BITS   15   /* fractional bits for sb_samples and dct */
  #define WFRAC_BITS  14   /* fractional bits for window */
  
++/* define it to use floats in quantization (I don't like floats !) */
++#define USE_FLOATS
++
  #include "mpegaudio.h"
  #include "mpegaudiodsp.h"
+ #include "mpegaudiodata.h"
+ #include "mpegaudiotab.h"
  
  /* currently, cannot change these constants (need to modify
     quantization stage) */