FFmpeg git repo
Go to file
Michael Niedermayer 1caf614bec Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavfi: autoinsert resample filter when necessary.
  lavfi: add lavr-based audio resampling filter.
  x86: vc1: drop MMX loop filter implementation, which uses MMX2 instructions.

Conflicts:
	configure
	doc/filters.texi
	libavcodec/x86/vc1dsp_mmx.c
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/avfiltergraph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-13 00:13:49 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-05-13 00:13:49 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-05-13 00:13:49 +02:00
libavdevice
libavfilter Merge remote-tracking branch 'qatar/master' 2012-05-13 00:13:49 +02:00
libavformat lavf: extend the avi raw hack to mov 2012-05-11 16:53:22 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
libpostproc
libswresample
libswscale
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-05-11 20:57:39 +02:00
tools
.gitignore doc/examples: add programs to .gitignore. 2012-05-12 19:58:33 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog
Doxyfile
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
cmdutils_common_opts.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-05-13 00:13:49 +02:00
ffmpeg.c ffmpeg: preserve bits_per_coded sample on stream copy. 2012-05-12 21:23:18 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-05-08 22:02:59 +02:00
ffserver.c
library.mak
version.sh

README

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

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

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.