* commit '5d6a990c':
  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>