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)
* commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e':
  dcadsp: Add a new method, qmf_32_subbands

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

Simple merge
Simple merge
Simple merge