Merge commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 10:10:53 +0000 (12:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 10:10:59 +0000 (12:10 +0200)
commit366e415836c52cce71b2f0d11fd04eea0a590c97
treec3a1f4d86b172e6c26580115d410e2147733ef90
parentc30eb74d182063c85a895c6fd3c9d47b93370bb0
parent800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e
Merge commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dcadec.c
libavcodec/dcadsp.c
libavcodec/dcadsp.h