ffmpeg/doc
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
..
doxy
examples Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
APIchanges cpu: add av_set_cpu_flags_mask(). 2012-03-06 15:02:28 +01:00
Makefile
RELEASE_NOTES RELEASE_NOTES: update for 0.10 2012-01-26 21:59:09 +01:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
avutil.txt
bitstream_filters.texi Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
build_system.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
decoders.texi
demuxers.texi
developer.texi
encoders.texi
errno.txt
eval.texi eval: add root() to solve f(x)=0 2012-02-27 00:00:55 +01:00
faq.texi faq: fix typo. 2012-01-24 16:03:09 +01:00
fate.texi Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
ffmpeg-mt-authorship.txt
ffmpeg.texi Merge remote-tracking branch 'qatar/master' 2012-02-27 04:35:35 +01:00
ffmpeg.txt Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
ffplay.texi
ffprobe.texi ffprobe: add count_frames and count_packets options 2012-02-17 01:06:43 +01:00
ffprobe.xsd ffprobe: report bit rate in stream description 2012-02-20 17:46:26 +01:00
ffserver.conf Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
ffserver.texi
filters.texi lavfi: add blackdetect filter 2012-03-04 12:31:06 +01:00
general.texi Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
git-howto.texi
git-howto.txt
indevs.texi
issue_tracker.txt
libavfilter.texi
metadata.texi
multithreading.txt
muxers.texi Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
optimization.txt
outdevs.texi
platform.texi
protocols.texi bluray protocol 2012-03-03 04:30:49 +01:00
rate_distortion.txt
snow.txt
soc.txt
swresample.txt
swscale.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00