FFmpeg/libavcodec/sh4
Michael Niedermayer ede45c4e1d Merge commit '25841dfe80'
* commit '25841dfe80':
  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
..
dsputil_align.c Merge commit '25841dfe80' 2013-02-06 12:18:25 +01:00
dsputil_sh4.c Merge commit '88bd7fdc82' 2013-01-23 17:44:56 +01:00
dsputil_sh4.h Merge commit '88bd7fdc82' 2013-01-23 17:44:56 +01:00
idct_sh4.c Merge commit '88bd7fdc82' 2013-01-23 17:44:56 +01:00
Makefile
qpel.c Merge remote-tracking branch 'qatar/master' 2013-01-24 15:47:47 +01:00
sh4.h