* commit 'd7c45043':
  ac3dec: validate channel output mode against channel count

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