Merge commit '71617884a2a673908bd5c0f73d4f91fdca3da82a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 13:59:44 +0000 (14:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 14:00:06 +0000 (15:00 +0100)
commit6f001d87ff019735ec0758bd2f0b183f36386748
tree6689b055bc6438d894ebd81905c8c2ef1b2dfcbd
parentd5560f1fecde7d7a1fa0d6089ec1e8dd68ed8be1
parent71617884a2a673908bd5c0f73d4f91fdca3da82a
Merge commit '71617884a2a673908bd5c0f73d4f91fdca3da82a'

* commit '71617884a2a673908bd5c0f73d4f91fdca3da82a':
  aarch64: h264 chroma motion compensation NEON optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aarch64/h264chroma_init_aarch64.c
libavcodec/aarch64/h264cmc_neon.S
libavcodec/aarch64/rv40dsp_init_aarch64.c
libavcodec/aarch64/vc1dsp_init_aarch64.c
libavcodec/h264chroma.c
libavcodec/h264chroma.h
libavcodec/rv34dsp.h
libavcodec/rv40dsp.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h