2 commits

Author	SHA1	Message	Date
Michael Niedermayer	d0aa60da10	Merge commit '8db00081a3' ... * commit '8db00081a3': x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/hpeldsp.c libavcodec/hpeldsp.h libavcodec/x86/Makefile libavcodec/x86/dsputil_mmx.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/hpeldsp_rnd_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-04-20 13:42:51 +02:00
Ronald S. Bultje	8db00081a3	x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp ... Signed-off-by: Martin Storsjö <martin@martin.st>	2013-04-19 23:18:53 +03:00