Merge commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 20:52:14 +0000 (21:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 20:52:25 +0000 (21:52 +0100)
commitfe6603745e930655ab8668037f7c43f9c5858c82
tree69c8ed6e6a1e68f73a897c66e0c3294a7da2554e
parentfb3c33f3cd6b932badbe61a3e0d5cce9f4e36769
parent6e4009d4cdf5927bdaedf58fcfc5e813b14c366b
Merge commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b'

* commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b':
  arm: dcadsp: implement decode_hf as external NEON asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/dcadsp_init_arm.c
libavcodec/arm/dcadsp_neon.S