Michael Niedermayer af804dbe9e Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534' ... * commit '523c7bd23c781aa0f3a85044896f5e18e8b52534': misc typo, style and wording fixes Conflicts: libavcodec/options_table.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-12-19 14:28:58 +01:00
..
dsputil_align.c	Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'	2012-12-19 14:28:58 +01:00
dsputil_sh4.c
dsputil_sh4.h
idct_sh4.c
Makefile
qpel.c	Merge remote-tracking branch 'qatar/master'	2012-12-10 12:13:42 +01:00
sh4.h