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)
commit9e552b65127aa51bf60726a38fb086ddaca74fdf
tree01d330a36fbaf4c995adb003c707fc37bca5ac87
parent506ad68d87f967640519a4d568c9236d53642a9a
parent68b100871961c3e6450871367630e5bf830f6cfd
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

* 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>
libavcodec/ac3dec.c
libavcodec/dca.c