[FFmpeg-cvslog] Merge commit '194d12345d86c15b20b7e44a3679c9df3075d7f6' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 16:23:49 2014 +0200| [e5294f407a81c2088ce21b5ae35469aff38ce100] | committer: Michael Niedermayer

Merge commit '194d12345d86c15b20b7e44a3679c9df3075d7f6' into release/2.2

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

Conflicts:
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5294f407a81c2088ce21b5ae35469aff38ce100
---