Merge commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e'

* commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e':
  dcadsp: Add a new method, qmf_32_subbands

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dcadec.c
Simple merge

diff --cc libavcodec/dcadsp.c
Simple merge

diff --cc libavcodec/dcadsp.h
Simple merge