Merge commit 'f896bca03fc63b93851c1c14c9321c20b3cd44a6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 14:36:23 +0000 (15:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 14:36:37 +0000 (15:36 +0100)
* commit 'f896bca03fc63b93851c1c14c9321c20b3cd44a6':
  aarch64: h264 (bi)weight NEON optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aarch64/h264dsp_init_aarch64.c
libavcodec/aarch64/h264dsp_neon.S

Simple merge