Michael Niedermayer 6df42f9874 Merge remote-tracking branch 'qatar/master' ... * qatar/master: SBR DSP: fix SSE code to not use SSE2 instructions. cpu: initialize mask to -1, so that by default, optimizations are used. error_resilience: initialize s->block_index[]. svq3: protect against negative quantizers. Don't use ff_cropTbl[] for IDCT. swscale: make filterPos 32bit. FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option. avconv: add -cpuflags option for setting supported cpuflags. cpu: add av_set_cpu_flags_mask(). libx264: Allow overriding the sliced threads option avconv: fix counting encoded video size. Conflicts: doc/APIchanges doc/fate.texi doc/ffmpeg.texi ffmpeg.c libavcodec/h264idct_template.c libavcodec/svq3.c libavutil/avutil.h libavutil/cpu.c libavutil/cpu.h libswscale/swscale.c tests/Makefile tests/fate-run.sh tests/regression-funcs.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-03-07 03:22:49 +01:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-03-01 03:17:11 +01:00
ref	Merge remote-tracking branch 'qatar/master'	2012-03-06 06:03:32 +01:00
asynth1.sw
audiogen.c
base64.c
codec-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-03-01 03:17:11 +01:00
copycooker.sh
fate_config.sh.template
fate-run.sh	Merge remote-tracking branch 'qatar/master'	2012-03-07 03:22:49 +01:00
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-03-05 00:15:55 +01:00
lavfi-regression.sh	fate: disable deshake test as it isnt binary identical across archs.	2012-02-29 07:03:04 +01:00
lena.pnm
Makefile	Merge remote-tracking branch 'qatar/master'	2012-03-07 03:22:49 +01:00
md5.sh
regression-funcs.sh	Merge remote-tracking branch 'qatar/master'	2012-03-07 03:22:49 +01:00
rotozoom.c
tiny_psnr.c
videogen.c