ffmpeg

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

Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX).

2011-11-09 01:58:22 +01:00

rgb2rgb.c

Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX).