* commit '702458538d4e52809bcef460d39baabf061b16b5': g722: Add ARM NEON implementation for g722_apply_qmf() Conflicts: libavcodec/arm/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Martin Storsjö <martin@martin.st>