$ 0 0 Merge remote-tracking branch 'qatar/master' * qatar/master: arm: Include hpeldsp_neon.o if h264qpel is enabled Merged-by: Michael Niedermayer [DH] libavcodec/arm/Makefile