ffmpeg-rockchip/libavcodec/alpha
Michael Niedermayer a984efd104 Merge commit 'c242bbd8b6'
* commit 'c242bbd8b6':
  Remove unnecessary dsputil.h #includes

Conflicts:
	libavcodec/ffv1.c
	libavcodec/h261dec.c
	libavcodec/h261enc.c
	libavcodec/h264pred.c
	libavcodec/lpc.h
	libavcodec/mjpegdec.c
	libavcodec/rectangle.h
	libavcodec/x86/idct_sse2_xvid.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-26 13:05:10 +01:00
..
asm.h
dsputil_alpha.c Merge commit '620289a20e' 2013-02-06 13:27:24 +01:00
dsputil_alpha.h Merge commit '11dcecfcca' 2013-02-25 12:22:18 +01:00
dsputil_alpha_asm.S Merge commit '88bd7fdc82' 2013-01-23 17:44:56 +01:00
Makefile
motion_est_alpha.c Merge commit 'c242bbd8b6' 2013-02-26 13:05:10 +01:00
motion_est_mvi_asm.S
mpegvideo_alpha.c Merge commit 'c242bbd8b6' 2013-02-26 13:05:10 +01:00
regdef.h
simple_idct_alpha.c Merge commit 'c242bbd8b6' 2013-02-26 13:05:10 +01:00