* commit '77ab341c':
  aacdec: add default case in channel layout

Conflicts:
	libavcodec/aacdec.c

Note, the default case is currently unreachable

See: a48b8903Merged-by: Michael Niedermayer <michaelni@gmx.at>