Merge commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 02:07:27 +0000 (04:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 02:07:27 +0000 (04:07 +0200)
commit952614b8996e33fe406ef91f537e5776cd55111c
tree848cfd5d9f1368b85b6863317a3b9378f8376836
parentd7644e0fdb5c6ba58091b62a27ba9eda4fd159f0
parentc8cf461c19e8e35df4b7364d9b90aa42f1ab4560
Merge commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560'

* commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560':
  dcadec: Do not decode the XCh extension when downmixing to stereo

Conflicts:
libavcodec/dcadec.c

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