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
..
Makefile
asm.h
dsputil_alpha.c
dsputil_alpha.h
dsputil_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
hpeldsp_alpha_asm.S Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044' 2013-04-20 15:24:25 +02:00
motion_est_alpha.c
motion_est_mvi_asm.S
mpegvideo_alpha.c
regdef.h Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044' 2013-04-20 15:24:25 +02:00
simple_idct_alpha.c