Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 21:27:34 +0000 (22:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 21:27:34 +0000 (22:27 +0100)
commitbc7f76377c1e8850af163646a98ab086a84f5d66
treee9601aa8be8325fc6fed43a0e479bdb3621f4aaa
parent4cf4da9dc5814aebe8881d93b4a88f593b774448
parent6bfdb2de881372048be7fbda643417e1fd3ce93c
Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'

* commit '6bfdb2de881372048be7fbda643417e1fd3ce93c':
  dcadec: set the output channel mode more accurately.

Conflicts:
libavcodec/dcadec.c

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