FFmpeg git repo
Go to file
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
doc Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
libavdevice alsa: fix timefilter usage. 2012-03-05 16:57:28 +01:00
libavfilter vsrx_mptestsrc: remove duplicate config_props init. 2012-03-07 00:20:23 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample Exit ffmpeg if swr_convert() fails. 2012-02-27 19:02:28 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
tools
.gitignore Remove libpostproc. 2012-02-23 19:36:16 +01:00
Changelog libutvideo: Add Ut Video encoder wrapper 2012-03-05 22:25:49 +01:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
common.mak
configure libutvideo: Add Ut Video encoder wrapper 2012-03-05 22:25:49 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
ffplay.c get_buffers: Check that pix_fmt is not NONE. 2012-02-29 06:27:38 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
INSTALL
library.mak
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS libutvideo: Add Ut Video encoder wrapper 2012-03-05 22:25:49 +01:00
Makefile Remove libpostproc. 2012-02-23 19:36:16 +01:00
README
RELEASE
version.sh

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.