Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 18:59:48 +0000 (20:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 19:10:10 +0000 (21:10 +0200)
commitd7463c681363d6057601e705d0bf775738529841
tree5aaab61d15d220df649ead3e432c36f72219ab2a
parent32cf26cc6a0dc1425ed60b8ac99552fd858fab9b
parentfab9df63a3156ffe1f9490aafaea41e03ef60ddf
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@gmx.at>
17 files changed:
libavcodec/Makefile
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_motion.c
libavcodec/mpegvideodsp.c
libavcodec/mpegvideodsp.h
libavcodec/ppc/Makefile
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/mpegvideodsp.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/mpegvideodsp.c