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

movenc: Decrease default chunk merge limit to 1mb.

2012-01-23 23:41:32 +01:00

audiogen.c

Merge remote-tracking branch 'qatar/master'

2012-01-19 01:19:38 +01:00

base64.c

Merge remote-tracking branch 'qatar/master'

2012-01-19 01:19:38 +01:00

codec-regression.sh

Merge remote-tracking branch 'qatar/master'

2012-03-01 03:17:11 +01:00

copycooker.sh

build: remove unused copy regression test script

2011-07-07 22:47:24 +02:00

fate_config.sh.template

tests: add a FATE configuration template

2011-11-24 00:33:20 +01:00

fate-run.sh

Merge remote-tracking branch 'qatar/master'

2012-03-07 03:22:49 +01:00

fate-update.sh

fate: remove stale fate-update.sh script

2011-03-19 13:35:52 +00:00

fate-valgrind.supp

Add a --valgrind configure option.

2012-01-21 12:04:46 +01:00

fate.sh

fate: add support for specifying the shell used to run configure

2012-01-30 20:35:09 +01:00

ffserver-regression.sh

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

ffserver.conf

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

ffserver.regression.ref

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

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

finished integrating rotozoom test in ffmpeg

2003-04-11 13:43:17 +00:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-03-07 03:22:49 +01:00

md5.sh

regtest: add openssl to md5 alternatives

2011-01-18 20:48:24 +00:00

regression-funcs.sh

Merge remote-tracking branch 'qatar/master'

2012-03-07 03:22:49 +01:00

rotozoom.c

Merge remote-tracking branch 'qatar/master'

2012-01-19 01:19:38 +01:00

tiny_psnr.c

Merge remote-tracking branch 'qatar/master'

2012-01-19 01:19:38 +01:00

videogen.c

Merge remote-tracking branch 'qatar/master'

2012-01-19 01:19:38 +01:00