1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavcodec/alpha
Michael Niedermayer ede45c4e1d Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'
* commit '25841dfe806a13de526ae09c11149ab1f83555a8':
  Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.

Conflicts:
	libavcodec/alpha/dsputil_alpha.c
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 12:18:25 +01:00
..
asm.h
dsputil_alpha_asm.S Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
dsputil_alpha.c Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8' 2013-02-06 12:18:25 +01:00
dsputil_alpha.h Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8' 2013-02-06 12:18:25 +01:00
Makefile
motion_est_alpha.c Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
motion_est_mvi_asm.S
mpegvideo_alpha.c Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
regdef.h
simple_idct_alpha.c Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00