Merge commit '1173320249745eab01c901a39054fc0fced33c87'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 18:29:40 +0000 (20:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 18:29:40 +0000 (20:29 +0200)
commitb8cdf0472674223227ee52e466eb75fe590a707c
tree240026b6450fa103f09ddf4ebba269cb0cbf872e
parent6779bf3f0fccad973c66af9894042fed19801b20
parent1173320249745eab01c901a39054fc0fced33c87
Merge commit '1173320249745eab01c901a39054fc0fced33c87'

* commit '1173320249745eab01c901a39054fc0fced33c87':
  dsputil: Drop unused bit_depth parameter from all init functions

Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/dsputil_arm.h
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/dsputilenc_mmx.c