[FFmpeg-cvslog] Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 20 22:06:01 2014 +0100| [ba85bfabf3a1b762b3e07f53d404f4c7c4e1703a] | committer: Michael Niedermayer

Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'

* commit '5169e688956be3378adb3b16a93962fe0048f1c9':
  dsputil: Propagate bit depth information to all (sub)init functions

Conflicts:
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv5te.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/arm/dsputil_init_neon.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/x86/dsputil_init.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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