Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 21:32:55 +0000 (23:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 21:33:07 +0000 (23:33 +0200)
commit96a4d0c1c3cf32ca9c98608b8c852d5c64f436bf
tree0e5578683a94dd763dbd47de70cf90ca5842a81b
parentef1961e7fc097db34557e5aaac55e5c50287adb9
parentf4d5a2cc35fcdf06ec031fabe8b0710e995fe924
Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'

* commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924':
  aarch64: NEON float to s16 audio conversion

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavresample/aarch64/audio_convert_init.c
libavresample/aarch64/audio_convert_neon.S
libavresample/audio_convert.c
libavresample/audio_convert.h