* commit '16e6652286213014c28a9c3af70435e767d28638': aarch64: NEON intrinsics dct_unquantize_h263. Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Intrinsics only used on aarch64 since the existing ARMv7 NEON asm is slightly faster (Cortex-A9, gcc-4.8, micro-benchmarks and full decoding time). Signed-off-by: James Yu <james.yu@linaro.org> Signed-off-by: Janne Grunau <janne-libav@jannau.net>