[FFmpeg-cvslog] Merge commit '5d6a990c115850326711c2f5be4d9fd33f399616'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 11 21:46:35 2013 +0100| [afc660ab9bdfde49be14bcf9ddb38e3688a07511] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=afc660ab9bdfde49be14bcf9ddb38e3688a07511
---