virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
dbe7170e2a
FFmpeg/libswscale/x86
History
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
..
input.asm Fix compilation with old yasm that does not support AVX. 2012-02-14 12:03:55 +01:00
output.asm Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
rgb2rgb_template.c
rgb2rgb.c
scale.asm Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
swscale_mmx.c Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
w64xmmtest.c win64: add a XMM clobber test configure option. 2012-02-02 12:00:48 -08:00
yuv2rgb_mmx.c
yuv2rgb_template.c