1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 35623d833e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  configure: Check for getenv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 13:05:45 +02:00
compat
doc Merge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a' 2013-05-05 10:47:19 +02:00
libavcodec Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487' 2013-05-05 11:34:29 +02:00
libavdevice Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' 2013-05-04 10:17:52 +02:00
libavfilter Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6' 2013-05-05 12:48:25 +02:00
libavformat Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f' 2013-05-05 12:41:36 +02:00
libavresample Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd' 2013-05-05 11:50:37 +02:00
libavutil Merge commit '1fda184a85178cfd7b98d9e308d18e1ded76a511' 2013-05-05 12:53:50 +02:00
libpostproc
libswresample
libswscale Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70' 2013-05-05 13:00:21 +02:00
presets
tests Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07' 2013-05-05 10:36:23 +02:00
tools Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' 2013-05-04 10:17:52 +02:00
.gitignore
arch.mak
Changelog extractplanes filter 2013-05-03 16:30:39 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-05-05 13:05:45 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a' 2013-05-01 17:24:43 +02:00
ffmpeg_opt.c Merge remote-tracking branch 'qatar/master' 2013-05-03 14:52:03 +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.