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

1.4 KiB

Raw Blame History

View Raw