Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 15:58:28 +0000 (17:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 15:58:28 +0000 (17:58 +0200)
commit99497b4683e5054bcdc5b6802a27d717df9e04f3
tree130022374c1a92b72288272bd0927ae6ac7d825b
parent0dae193d3ecf5d0dc687f5ad708419bf7600de9a
parent9a9e2f1c8aa4539a261625145e5c1f46a8106ac2
Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'

* commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2':
  dsputil: Split audio operations off into a separate context

Conflicts:
configure
libavcodec/takdec.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
41 files changed:
configure
libavcodec/Makefile
libavcodec/ac3enc.c
libavcodec/ac3enc.h
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavcodec/ac3enc_template.c
libavcodec/acelp_pitch_delay.c
libavcodec/acelp_pitch_delay.h
libavcodec/arm/Makefile
libavcodec/arm/audiodsp_arm.h
libavcodec/arm/audiodsp_init_arm.c
libavcodec/arm/audiodsp_init_neon.c
libavcodec/arm/audiodsp_neon.S
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/audiodsp.c
libavcodec/audiodsp.h
libavcodec/cook.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/g729dec.c
libavcodec/g729postfilter.c
libavcodec/g729postfilter.h
libavcodec/ppc/Makefile
libavcodec/ppc/audiodsp.c
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ra144.c
libavcodec/ra144.h
libavcodec/ra144dec.c
libavcodec/ra144enc.c
libavcodec/takdec.c
libavcodec/x86/Makefile
libavcodec/x86/audiodsp.asm
libavcodec/x86/audiodsp.h
libavcodec/x86/audiodsp_init.c
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h