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
..
2012-02-03 03:51:32 +01:00
2012-03-07 03:22:49 +01:00
2012-02-08 05:53:35 +01:00
2012-03-07 03:22:49 +01:00
2012-02-01 14:24:25 +01:00
2012-03-04 00:43:18 +01:00
2010-01-16 04:48:55 +00:00
2012-02-09 01:27:12 +01:00
2012-03-05 00:15:55 +01:00
2012-03-04 13:42:16 +01:00
2012-02-23 04:31:55 +01:00
2012-02-23 04:31:55 +01:00
2012-01-14 02:22:09 +01:00
2012-03-07 03:22:49 +01:00
2012-02-08 05:53:35 +01:00
2012-01-14 02:22:09 +01:00
2012-03-07 03:22:49 +01:00
2012-01-10 03:50:41 +01:00
2012-03-07 03:22:49 +01:00
2012-02-23 04:31:55 +01:00