Merge commit '194d12345d86c15b20b7e44a3679c9df3075d7f6' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 14:23:49 +0000 (16:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 14:23:49 +0000 (16:23 +0200)
commite5294f407a81c2088ce21b5ae35469aff38ce100
tree5f346cc800122f9dacf05bc668b8bcb62b2fa009
parented1ad2f5ebe9ad4ee8700760e97d30ca5b75d9ec
parent194d12345d86c15b20b7e44a3679c9df3075d7f6
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@gmx.at>
libavcodec/dcadec.c