[FFmpeg-cvslog] Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 20:59:48 2014 +0200| [d7463c681363d6057601e705d0bf775738529841] | committer: Michael Niedermayer

Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'

* commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf':
  dsputil: Split off global motion compensation bits into a separate context

Conflicts:
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

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

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