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
..
2011-12-29 17:19:46 +01:00
2012-02-25 04:00:43 +01:00
2012-03-06 15:02:28 +01:00
2012-03-07 03:22:49 +01:00
2011-05-11 13:43:30 +02:00
2012-02-25 04:00:43 +01:00
2012-02-09 12:26:45 +01:00
2011-12-15 18:38:04 +01:00
2011-12-15 18:38:06 +01:00
2011-12-20 18:12:36 +01:00
2012-01-04 13:21:08 +01:00
2011-12-21 19:59:45 +01:00
2012-02-27 00:00:55 +01:00
2012-01-24 16:03:09 +01:00
2012-03-07 03:22:49 +01:00
2011-04-19 01:17:59 +02:00
2012-02-27 04:35:35 +01:00
2012-01-28 11:04:19 +01:00
2011-12-14 21:09:08 +01:00
2012-02-17 01:06:43 +01:00
2012-02-20 17:46:26 +01:00
2012-02-10 01:20:07 +01:00
2011-12-12 01:25:37 +01:00
2012-03-04 12:31:06 +01:00
2012-03-03 00:23:10 +01:00
2011-12-10 02:01:03 +01:00
2011-11-23 23:03:37 +01:00
2012-01-05 02:03:12 +01:00
2011-09-02 23:08:03 +02:00
2012-01-04 13:21:08 +01:00
2011-12-24 02:56:52 +01:00
2011-03-17 17:26:45 +01:00
2011-03-17 17:26:45 +01:00
2012-03-01 03:17:11 +01:00
2011-04-08 01:35:43 +02:00
2012-01-04 13:21:08 +01:00
2012-01-11 13:48:30 +01:00
2012-03-03 04:30:49 +01:00
2009-03-30 10:39:20 +00:00
2012-01-26 21:59:09 +01:00
2008-02-08 19:17:46 +00:00
2011-12-12 01:25:37 +01:00
2011-10-06 00:32:01 +02:00
2012-02-09 12:26:45 +01:00
2011-12-10 02:01:03 +01:00
2010-06-27 14:31:50 +00:00
2011-07-09 21:53:59 +02:00
2012-02-09 12:26:45 +01:00