angler-fishThe Vulnerability History Project

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>
    
commit d7463c681363d6057601e705d0bf775738529841
+2 -2
+91
+15
-1
-2
+34 -33
-119
-47
+2 -2
+2 -1
+2
+3 -12
+1 -2
+3
+123
+5
-161
expand_less