Merge commit '5c22e8e4ad0852d61d5c4ba8d67d33fd72339497'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 00:33:00 +0000 (02:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 00:33:26 +0000 (02:33 +0200)
* commit '5c22e8e4ad0852d61d5c4ba8d67d33fd72339497':
  armv6: Accelerate ff_imdct_half for general case (mdct_bits != 6)

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

Trivial merge