FFmpeg git repo
Go to file
Michael Niedermayer c32db6adab Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'
* commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7':
  configure: Properly set zlib dependencies for all components

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 19:29:27 +02:00
compat
doc Merge commit '605387582bd35920b83a26dabbe1c0601f425621' 2013-08-06 15:33:12 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-08-06 16:48:31 +02:00
libavdevice avdevice/vfwcap: make constant arrays static 2013-08-03 22:24:31 +02:00
libavfilter Merge commit '3799376dd3373ee255651ed542c75b15665801a8' 2013-08-06 09:35:03 +02:00
libavformat Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b' 2013-08-06 18:30:47 +02:00
libavresample Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 2013-08-03 09:16:36 +02:00
libavutil Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909' 2013-08-06 13:45:21 +02:00
libpostproc
libswresample
libswscale Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 2013-08-03 09:16:36 +02:00
presets
tests fate: Add vorbiscomment cover art test 2013-08-05 10:48:37 +02:00
tools Merge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc' 2013-08-06 14:50:27 +02:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: order libavutil entries alphabetically 2013-08-04 11:24:57 +02:00
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7' 2013-08-06 19:29:27 +02:00
ffmpeg.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg.h Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg_filter.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg_opt.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffplay.c
ffprobe.c
ffserver.c Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7' 2013-08-06 09:13:51 +02:00
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.