[FFmpeg-cvslog] Merge commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 13 21:08:28 2014 +0200| [98227ba5fa456b5dacd404e125420c9abf87ff95] | committer: Michael Niedermayer

Merge commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78'

* commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78':
  ppc: dsputil: Coalesce all init files

Conflicts:
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/ppc/dsputil_ppc.c

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

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