FFmpeg git repo
Go to file
Michael Niedermayer a1ce060c51 Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'
* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
  avfilter: have avfilter_get_by_name return const for next bump

Conflicts:
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 13:07:05 +01:00
compat
doc
libavcodec Merge commit '97de206b44a48da726807cc3e7b9448a8112760b' 2013-10-28 12:47:10 +01:00
libavdevice
libavfilter Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e' 2013-10-28 13:07:05 +01:00
libavformat Merge commit '53151723e377b9c43f876e20d7f27a17993256c8' 2013-10-28 12:17:57 +01:00
libavresample
libavutil Merge commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3' 2013-10-28 11:26:48 +01:00
libpostproc
libswresample
libswscale
presets
tests
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge commit 'de6061203e2d509579ab110fb1873aade34320f5' 2013-10-28 11:32:22 +01:00
ffmpeg.c Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46' 2013-10-28 10:46:47 +01:00
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
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.