commit | 79bb5d6abc7181bc33e96a3da6089bb41d0bf557 | [log] [tgz] |
---|---|---|
author | Dale Sather <dalesat@google.com> | Mon Oct 15 16:38:38 2018 -0700 |
committer | Dale Sather <dalesat@google.com> | Mon Nov 05 13:58:18 2018 -0800 |
tree | b09bbb45c695c26345d5b5d28f6123d2cda2338e | |
parent | eed865bd5ad545bec94d89b80a75f0dcc34137bb [diff] | |
parent | 41ed2c384993da0cbc69657f05bec3c9b21b78bf [diff] |
Merge branch 'upstream/master' Includes some changes to fuchsia/scripts and README.fuchsia to update the upstream merge procedure. The new upstream/master version is: commit 41ed2c384993da0cbc69657f05bec3c9b21b78bf Date: Fri Oct 5 11:36:51 2018 -0700 previous upstream/master version was: commit 6a97ba521558ce131fe839eed2d51ff745280e1d Date: Sun Feb 11 22:30:54 2018 +0100 Change-Id: I3d145f63480f985a30cf6474ac032b5c565ce8b7
FFmpeg is a collection of libraries and tools to process multimedia content such as audio, video, subtitles and related metadata.
libavcodec
provides implementation of a wider range of codecs.libavformat
implements streaming protocols, container formats and basic I/O access.libavutil
includes hashers, decompressors and miscellaneous utility functions.libavfilter
provides a mean to alter decoded Audio and Video through chain of filters.libavdevice
provides an abstraction to access capture and playback devices.libswresample
implements audio mixing and resampling routines.libswscale
implements color conversion and scaling routines.aviocat
, ismindex
and qt-faststart
.The offline documentation is available in the doc/ directory.
The online documentation is available in the main website and in the wiki.
Coding examples are available in the doc/examples directory.
FFmpeg codebase is mainly LGPL-licensed with optional components licensed under GPL. Please refer to the LICENSE file for detailed information.
Patches should be submitted to the ffmpeg-devel mailing list using git format-patch
or git send-email
. Github pull requests should be avoided because they are not part of our review process and will be ignored.