* 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>