1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavcodec/sh4
Michael Niedermayer 6d1e9d993a Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'
* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
  dsputil: remove avg_no_rnd_pixels8.

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 17:52:21 +01:00
..
dsputil_align.c Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836' 2013-01-23 17:52:21 +01:00
dsputil_sh4.c Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
dsputil_sh4.h Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
idct_sh4.c Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
Makefile
qpel.c Merge remote-tracking branch 'qatar/master' 2012-12-10 12:13:42 +01:00
sh4.h