[FFmpeg-cvslog] Merge commit '1173320249745eab01c901a39054fc0fced33c87'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 11 20:29:40 2014 +0200| [b8cdf0472674223227ee52e466eb75fe590a707c] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8cdf0472674223227ee52e466eb75fe590a707c
---