FFmpeg/libavcodec/alpha
Michael Niedermayer 6ec26157b9 Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'
* commit '2957d29f0531ccd8a6f4378293424dfd92db3044':
  alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/alpha/dsputil_alpha.c
	libavcodec/alpha/hpeldsp_alpha.c
	libavcodec/alpha/hpeldsp_alpha.h
	libavcodec/alpha/hpeldsp_alpha_asm.S
	libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 15:24:25 +02:00
..
asm.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_alpha_asm.S Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044' 2013-04-20 15:24:25 +02:00
dsputil_alpha.c alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp 2013-04-19 23:29:22 +03:00
dsputil_alpha.h alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp 2013-04-19 23:29:22 +03:00
hpeldsp_alpha_asm.S Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044' 2013-04-20 15:24:25 +02:00
hpeldsp_alpha.c Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044' 2013-04-20 15:24:25 +02:00
hpeldsp_alpha.h Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044' 2013-04-20 15:24:25 +02:00
Makefile alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp 2013-04-19 23:29:22 +03:00
motion_est_alpha.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00
motion_est_mvi_asm.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mpegvideo_alpha.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00
regdef.h Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044' 2013-04-20 15:24:25 +02:00
simple_idct_alpha.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00