* commit '3d3cf674':
  aacdec: use float planar sample format for output

Conflicts:
	libavcodec/aacdec.c
	libavcodec/aacsbr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>