2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	d7463c6813	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>	2014-06-23 21:10:10 +02:00
Diego Biurrun	fab9df63a3	dsputil: Split off global motion compensation bits into a separate context	2014-06-23 09:58:17 -07:00