* commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4': Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs Conflicts: libavcodec/ac3enc_float.c Merged-by: Michael Niedermayer <michaelni@gmx.at>