* commit '70245853':
  g722: Add ARM NEON implementation for g722_apply_qmf()

Conflicts:
	libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>