Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 20 Jan 2013 13:07:51 +0000 (14:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 20 Jan 2013 13:13:16 +0000 (14:13 +0100)
commitc62cb1112ffc32492c99aa1e94324fc6a951abe9
tree4ed9a1feb6ea8db5b431487e6618d1015e84eb9a
parentcf061a9c3b861a048dd5b67ded5265c6f53805e5
parentfef906c77c09940a2fdad155b2adc05080e17eda
Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'

* commit 'fef906c77c09940a2fdad155b2adc05080e17eda':
  Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.

Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
libavcodec/Makefile
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/arm/vorbisdsp_init_arm.c
libavcodec/arm/vorbisdsp_neon.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/vorbisdsp_altivec.c
libavcodec/vorbisdec.c
libavcodec/vorbisdsp.c
libavcodec/vorbisdsp.h
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/vorbisdsp_init.c