Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 11:50:57 +0000 (13:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 11:51:05 +0000 (13:51 +0200)
* qatar/release/0.8:
  adpcm: Unbreak ima-dk4
  ac3dec: validate channel output mode against channel count
  dca: Respect the current limits in the downmixing capabilities

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/ac3dec.c
libavcodec/dca.c

Simple merge
Simple merge