FFmpeg git repo
Go to file
Michael Niedermayer 0d487654ea Merge commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4'
* commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4':
  http: Improve options descriptions

Conflicts:
	doc/protocols.texi
	libavformat/http.c

See: 255ec768da
See: 0a7cd74043
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 04:43:21 +01:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc Merge commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4' 2014-03-12 04:43:21 +01:00
libavcodec avcodec/vorbisdec: use the stored previous window type only when the actual previous is not known 2014-03-11 20:45:29 +01:00
libavdevice
libavfilter
libavformat Merge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab' 2014-03-12 04:29:54 +01:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2014-03-09 15:37:35 +01:00
libpostproc
libswresample
libswscale
presets
tests Add fieldmatch test 2014-03-10 02:59:01 +01:00
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
cmdutils_opencl.c
common.mak
configure Merge commit '390acbea0697a60300f249602dbf701e04274693' 2014-03-12 02:22:16 +01:00
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffplay.c ffplay: display information on stream cycling 2014-03-12 00:32:38 +01:00
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.