[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 22 13:50:57 2013 +0200| [9e552b65127aa51bf60726a38fb086ddaca74fdf] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e552b65127aa51bf60726a38fb086ddaca74fdf
---