Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 03:12:40 +0000 (04:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 03:12:40 +0000 (04:12 +0100)
commit8e70fdab3614a5ef709d60b67c6729c3eca93c21
treee18aa3e652eb2ec4949bd4186e49aa385a0d39a8
parenta12f679a5db9a2069f58a993317720c5b4f82c27
parent4958f35a2ebc307049ff2104ffb944f5f457feb3
Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'

* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
  dsputil: Move apply_window_int16 to ac3dsp

Conflicts:
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/x86/ac3dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavcodec/ac3enc_template.c
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/x86/ac3dsp_init.c
libavcodec/x86/dsputil_init.c