* commit '194d1234':
  dcadec: Use correct channel count in stereo downmix check

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