Michael Niedermayer fdb1f7eb7a Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493' ... * commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493': sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/hpeldsp.h libavcodec/sparc/dsputil_vis.c libavcodec/sparc/hpeldsp_vis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-04-20 15:11:06 +02:00
..
dsputil_vis.c	Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'	2013-04-20 15:11:06 +02:00
dsputil_vis.h
hpeldsp_vis.c	Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'	2013-04-20 15:11:06 +02:00
Makefile	sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp	2013-04-19 23:29:22 +03:00
simple_idct_vis.c	Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'	2013-02-26 13:05:10 +01:00
vis.h	Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'	2013-04-20 15:11:06 +02:00