Merge commit 'b3d8276d2dc913d708d187fb15f6e98869d00500' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 14:23:29 +0000 (16:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 14:23:29 +0000 (16:23 +0200)
commited1ad2f5ebe9ad4ee8700760e97d30ca5b75d9ec
tree7a3a82e99298665531bde5af4ef94ac5812ce1a5
parentc2eb668617555cb8b8bcfb9796241ada9471ac65
parentb3d8276d2dc913d708d187fb15f6e98869d00500
Merge commit 'b3d8276d2dc913d708d187fb15f6e98869d00500' into release/2.2

* commit 'b3d8276d2dc913d708d187fb15f6e98869d00500':
  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