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-11 01:22:22 +01:00
2012-03-06 06:03:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-12 21:42:31 +01:00
2012-02-16 01:34:37 +01:00
2012-02-10 01:20:07 +01:00
2012-02-10 01:20:07 +01:00
2012-02-10 01:20:07 +01:00
2012-02-10 01:20:07 +01:00
2012-02-01 02:36:09 +01:00
2012-02-28 03:38:58 +01:00
2012-02-21 05:10:12 +01:00
2012-02-08 05:53:35 +01:00
2012-02-09 01:27:12 +01:00
2012-02-12 18:56:06 +01:00
2012-02-09 01:27:12 +01:00
2012-03-02 10:33:05 -08:00
2012-02-12 18:56:06 +01:00
2012-02-10 01:20:07 +01:00
2012-02-09 12:26:45 +01:00
2012-02-12 21:42:31 +01:00
2012-02-25 04:00:43 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-31 02:46:26 +01:00
2012-02-10 23:18:52 +01:00
2012-02-12 21:42:31 +01:00
2012-02-20 14:58:25 -08:00
2012-02-20 14:58:25 -08:00
2012-02-03 20:42:30 +01:00
2012-02-23 15:50:09 -08:00
2012-03-06 13:40:35 -08:00
2012-02-22 02:24:18 +01:00
2012-02-12 21:42:31 +01:00
2012-03-05 00:15:55 +01:00
2012-03-05 00:15:55 +01:00
2012-02-02 12:00:48 -08:00