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

Merge commit '9e0f14f16cfc9456a691655fda7d01090bffe47e'

2013-04-08 12:47:49 +02:00

dsputil_sh4.h

Merge commit '278bd2054ca61ab70dfe38f1774409cda2da5359'

2013-04-20 15:04:06 +02:00

h264chroma_init.c

Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'

2013-02-07 13:09:35 +01:00

hpeldsp.c

Merge commit '278bd2054ca61ab70dfe38f1774409cda2da5359'

2013-04-20 15:04:06 +02:00

idct_sh4.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

Makefile

sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

2013-04-19 23:29:21 +03:00

qpel.c

Merge commit '9e0f14f16cfc9456a691655fda7d01090bffe47e'

2013-04-08 12:47:49 +02:00

sh4.h

…