1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Clément Bœsch c0ff42bf64 Merge commit '393596f9d51134d6e45d81ae129223f4faea1232'
* commit '393596f9d51134d6e45d81ae129223f4faea1232':
  mpegtsenc: stop impersonating ses in sdt

This commit also includes the needed FATE updates later spotted by
Martin Storsjö and fixed in 34effe816f on
Libav side.

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-23 08:17:31 +02:00
compat
doc Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8' 2016-06-22 22:38:49 +02:00
libavcodec lavc: fix previous merge 2016-06-23 00:42:16 +02:00
libavdevice dshow: avoid duplicate NULL check before free 2016-06-23 03:18:16 +02:00
libavfilter Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 2016-06-22 13:44:34 +02:00
libavformat Merge commit '393596f9d51134d6e45d81ae129223f4faea1232' 2016-06-23 08:17:31 +02:00
libavresample Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 2016-06-22 13:44:34 +02:00
libavutil hwcontext_dxva2: support P010 10-bit surfaces 2016-06-22 23:28:47 +02:00
libpostproc
libswresample swr: fix time.h include 2016-06-22 14:00:08 +02:00
libswscale Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 2016-06-22 13:44:34 +02:00
presets
tests Merge commit '393596f9d51134d6e45d81ae129223f4faea1232' 2016-06-23 08:17:31 +02:00
tools Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801' 2016-06-22 11:28:51 +02:00
.gitattributes
.gitignore Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 2016-06-22 13:44:34 +02:00
.travis.yml
arch.mak
Changelog Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 2016-06-21 21:55:34 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 2016-06-22 13:44:34 +02:00
configure Merge commit '1f1ad8ace040a08edc2646ff638ca42a8828779f' 2016-06-21 22:03:18 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_cuvid.c
ffmpeg_dxva2.c Merge commit 'b23613268c6b56a8f9de7859562d82b4b88353d9' 2016-06-22 23:36:37 +02:00
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_qsv.c
ffmpeg_vaapi.c Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5' 2016-06-21 22:22:51 +02:00
ffmpeg_vdpau.c Merge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4' 2016-06-21 15:26:20 +02:00
ffmpeg_videotoolbox.c
ffmpeg.c Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 2016-06-21 21:55:34 +02:00
ffmpeg.h
ffplay.c Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 2016-06-21 21:55:34 +02:00
ffprobe.c
ffserver_config.c
ffserver_config.h
ffserver.c
INSTALL.md
library.mak Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 2016-06-22 13:44:34 +02:00
LICENSE.md
MAINTAINERS MAINTAINERS: Remove Linux / PowerPC maintainer 2016-06-23 00:55:13 +02:00
Makefile
README.md
RELEASE
version.sh

FFmpeg README

FFmpeg is a collection of libraries and tools to process multimedia content such as audio, video, subtitles and related metadata.

Libraries

  • 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.

Tools

  • ffmpeg is a command line toolbox to manipulate, convert and stream multimedia content.
  • ffplay is a minimalistic multimedia player.
  • ffprobe is a simple analysis tool to inspect multimedia content.
  • ffserver is a multimedia streaming server for live broadcasts.
  • Additional small tools such as aviocat, ismindex and qt-faststart.

Documentation

The offline documentation is available in the doc/ directory.

The online documentation is available in the main website and in the wiki.

Examples

Coding examples are available in the doc/examples directory.

License

FFmpeg codebase is mainly LGPL-licensed with optional components licensed under GPL. Please refer to the LICENSE file for detailed information.

Contributing

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. Few developers follow pull requests so they will likely be ignored.