Merge commit '801c39e1e3058fc4ba822bfb5d8612d777111e32'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 02:23:56 +0000 (04:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 02:23:56 +0000 (04:23 +0200)
commita676e48d394cf9972730859d62f537dfe0a9dce2
tree3907298c9cd51a8b9e77e8c11b2ff89799e07e38
parent952614b8996e33fe406ef91f537e5776cd55111c
parent801c39e1e3058fc4ba822bfb5d8612d777111e32
Merge commit '801c39e1e3058fc4ba822bfb5d8612d777111e32'

* commit '801c39e1e3058fc4ba822bfb5d8612d777111e32':
  dcadec: Use correct channel count in stereo downmix check

Conflicts:
libavcodec/dcadec.c

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