Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Mar 2012 01:57:53 +0000 (02:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Mar 2012 02:22:49 +0000 (03:22 +0100)
commit6df42f98746be06c883ce683563e07c9a2af983f
tree6bb893aaf179526515cfb3b1cc933721317dcf6f
parent57986c501e8c97d4bd2e1b7ce9e9037c4ae06245
parentb5161908e06b4497bf663510fb495ba97a6fd2b5
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>
28 files changed:
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
doc/avtools-common-opts.texi
doc/fate.texi
ffmpeg.c
libavcodec/dsputil.c
libavcodec/error_resilience.c
libavcodec/h264idct_template.c
libavcodec/libx264.c
libavcodec/simple_idct.c
libavcodec/simple_idct_template.c
libavcodec/vc1dsp.c
libavcodec/vp3dsp.c
libavcodec/vp8dsp.c
libavutil/avutil.h
libavutil/cpu.c
libavutil/cpu.h
libswscale/ppc/swscale_altivec.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.c
libswscale/x86/scale.asm
libswscale/x86/swscale_mmx.c
libswscale/x86/swscale_template.c
tests/Makefile
tests/fate-run.sh
tests/regression-funcs.sh