FFmpeg/libavcodec/sh4
Michael Niedermayer 1e7a92f219 Merge commit 'baf35bb4bc'
* commit 'baf35bb4bc':
  dsputil: remove one array dimension from avg_no_rnd_pixels_tab.

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 18:15:29 +01:00
..
dsputil_align.c Merge commit 'baf35bb4bc' 2013-01-23 18:15:29 +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' 2012-12-10 12:13:42 +01:00
sh4.h