Merge commit '702458538d4e52809bcef460d39baabf061b16b5'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:16:29 +0000 (02:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:16:29 +0000 (02:16 +0100)
commite86f754b1c5f1e0d2e04e2f2c20885706ae50366
treed29859b1628bb64984128a3320c8aab0052f2bef
parent39b40be2a1303013783df7cc184ffe1860ff31ce
parent702458538d4e52809bcef460d39baabf061b16b5
Merge commit '702458538d4e52809bcef460d39baabf061b16b5'

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

Conflicts:
libavcodec/arm/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/Makefile
libavcodec/arm/g722dsp_init_arm.c
libavcodec/arm/g722dsp_neon.S
libavcodec/g722dsp.c
libavcodec/g722dsp.h