Go to file
Michael Niedermayer 8d9537228f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  msvc: Move linker pragma from config.h to libavutil/internal.h

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 14:32:43 +02:00
compat
doc Merge commit '481575d255195c6c2f32e04686b94de984ae78d4' 2013-05-08 12:07:56 +02:00
libavcodec Merge commit '1b343cedd7cd68e7865aa5280d1568c7e5d79917' 2013-05-08 14:13:48 +02:00
libavdevice Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' 2013-05-04 10:17:52 +02:00
libavfilter lavfi/unsharp: use verbal form in help message options 2013-05-08 01:39:12 +02:00
libavformat Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4' 2013-05-08 13:41:45 +02:00
libavresample Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd' 2013-05-05 11:50:37 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-05-08 14:32:43 +02:00
libpostproc
libswresample
libswscale sws: factorize rgb 9+ planar funcs declarations. 2013-05-07 15:23:27 +02:00
presets
tests Merge commit 'bd392785a75d7d51414a9788d50396a8d9f29d77' 2013-05-08 14:21:39 +02:00
tools Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' 2013-05-04 10:17:52 +02:00
.gitignore
arch.mak
Changelog avconv: remove -deinterlace 2013-05-07 12:31:55 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-05-08 14:32:43 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: move a local variable definition later. 2013-05-07 18:39:45 +02:00
ffmpeg.c ffmpeg: drop old non monotone dts workaround. 2013-05-03 15:04:47 +02:00
ffmpeg.h Merge remote-tracking branch 'qatar/master' 2013-05-03 14:52:03 +02:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

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.