[FFmpeg-cvslog] Merge commit 'adff0a8166345bb9513f0f658043fb6387e90122'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 16 20:09:25 2014 +0200| [21dfabfa6461e809fbfe205b94ded5f9d155e67b] | committer: Michael Niedermayer

Merge commit 'adff0a8166345bb9513f0f658043fb6387e90122'

* commit 'adff0a8166345bb9513f0f658043fb6387e90122':
  arm: dsputil: Coalesce all init files

Conflicts:
	libavcodec/arm/Makefile
	libavcodec/arm/dsputil_arm.h
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv6.c

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

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