• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 6df42f98
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6df42f98
ffmpeg.c 192 KB