Merge commit '5d6a990c115850326711c2f5be4d9fd33f399616'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Nov 2013 20:46:35 +0000 (21:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Nov 2013 20:46:35 +0000 (21:46 +0100)
commitafc660ab9bdfde49be14bcf9ddb38e3688a07511
treee6368ea4e9f65323462b90f3faa4737778d0a8ce
parentf9b89b61f819535b4dbe6c3e9f0d6fc8becf64cb
parent5d6a990c115850326711c2f5be4d9fd33f399616
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>
libavcodec/mpegaudioenc.c