1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Go to file
James Almer 507e3f7d26 Merge commit '17f5171cd4753e7f50e6d95df069bccbc90265bf'
* commit '17f5171cd4753e7f50e6d95df069bccbc90265bf':
  arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp
  lavc: fix hw_device_ctx operation

This commit is a noop, see
48e4eda11d
f1fd12ef85

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 23:29:52 -03:00
compat Merge commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed' 2017-11-11 16:59:36 -03:00
doc Merge commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24' 2017-11-11 20:33:26 -03:00
ffbuild Merge commit 'abf1c058d1bd0ed1b820ea5e501a4484756f00b0' 2017-11-11 11:29:16 -03:00
fftools ffmpeg: use explicitly requested hwaccel only 2017-11-11 14:19:05 +01:00
libavcodec avcodec/Makefile: build libxvid_rc.o only if libxvid_encoder is enabled 2017-11-11 22:25:12 -03:00
libavdevice Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784' 2017-11-11 16:19:50 -03:00
libavfilter Merge commit 'ea25ccd1b2a980df8d43cc1f86a23e3c094090a6' 2017-11-11 15:24:08 -03:00
libavformat Merge commit 'e41daa62465036ad36ad0bd14e4936e848d7f07e' 2017-11-11 10:22:11 -03:00
libavresample Merge commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5' 2017-10-21 14:57:53 -03:00
libavutil Merge commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d' 2017-11-11 17:46:48 -03:00
libpostproc postproc: Drop deprecated qp typedef 2017-10-22 00:35:23 -03:00
libswresample lswr/rematrix: Support s32p. 2017-11-01 01:04:43 +01:00
libswscale Merge commit '29ccc641b17afad058a5c24071ea827865a8b3a9' 2017-11-11 16:09:09 -03:00
presets
tests Merge commit 'ec0f4fa17ce29cf01d4def21041b0b87f7e3105d' 2017-11-11 18:37:54 -03:00
tools Merge commit 'f19fbfbdc637e08ad5c980807ede2d023f20c049' 2017-11-11 13:55:35 -03:00
.gitattributes
.gitignore
.travis.yml Merge commit '4809781586d1c956005f72946a2aab5915eab350' 2017-10-28 15:08:31 -03:00
Changelog Merge commit 'a5a6ac1a123a927e5bed984ed757a29b7ff87dab' 2017-11-11 15:07:06 -03:00
configure Merge commit '68649bfed30a35dc3e45ea240541b2774b2f282b' 2017-11-11 23:21:55 -03:00
CONTRIBUTING.md
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
INSTALL.md
LICENSE.md
MAINTAINERS Maintainers : add myself for exr 2017-11-05 22:13:12 +01:00
Makefile Merge commit 'cbcdb2d8e47f62f69accee62c08f487a27848174' 2017-11-11 23:15:31 -03:00
README.md
RELEASE

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 and will be ignored.