* commit 'e9d61de9':
  mpegaudiodec: Validate that the number of channels fits at the given offset

Conflicts:
	libavcodec/mpegaudiodec.c

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