FFmpeg/libavcodec/sh4
Michael Niedermayer 4bdec0e71e Merge commit '278bd2054ca61ab70dfe38f1774409cda2da5359'
* commit '278bd2054ca61ab70dfe38f1774409cda2da5359':
  sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/hpeldsp.c
	libavcodec/hpeldsp.h
	libavcodec/sh4/dsputil_align.c
	libavcodec/sh4/dsputil_sh4.h
	libavcodec/sh4/hpeldsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 15:04:06 +02:00
..
dsputil_align.c Merge commit '278bd2054ca61ab70dfe38f1774409cda2da5359' 2013-04-20 15:04:06 +02:00
dsputil_sh4.c
dsputil_sh4.h Merge commit '278bd2054ca61ab70dfe38f1774409cda2da5359' 2013-04-20 15:04:06 +02:00
h264chroma_init.c
hpeldsp.c Merge commit '278bd2054ca61ab70dfe38f1774409cda2da5359' 2013-04-20 15:04:06 +02:00
idct_sh4.c
Makefile
qpel.c
sh4.h