* commit '7464e98f':
  aac: Simplify decode_mid_side_stereo

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