Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 22:59:15 +0000 (00:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 22:59:15 +0000 (00:59 +0200)
commit40f3a87c10d5773eb66e09f4ed3d8197b1840863
treebee50efb5beaff032de1fc4dcd797e3000b30c4c
parent5c6e94c42bcdc026071855a6b1749406b2456c8b
parent054013a0fc6f2b52c60cee3e051be8cc7f82cef3
Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'

* commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3':
  dsputil: Move APE-specific bits into apedsp

Conflicts:
libavcodec/arm/int_neon.S
libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
16 files changed:
libavcodec/apedec.c
libavcodec/apedsp.h
libavcodec/arm/Makefile
libavcodec/arm/apedsp_init_arm.c
libavcodec/arm/apedsp_neon.S
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/int_neon.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/apedsp_altivec.c
libavcodec/ppc/int_altivec.c
libavcodec/x86/Makefile
libavcodec/x86/apedsp.asm
libavcodec/x86/apedsp_init.c
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c