1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
James Almer 29db87af52 Merge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'
* commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4':
  x86: Add missing colons after assembly labels

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:05:27 -03:00
compat compat/atomics/gcc: use __typeof__ instead of typeof 2017-03-18 12:13:46 -03:00
doc Merge commit '89b35a139e838deeb32ec20d8d034c81014401d0' 2017-03-23 16:31:15 -03:00
libavcodec Merge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4' 2017-03-23 18:05:27 -03:00
libavdevice Merge commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f' 2017-03-22 17:55:18 +01:00
libavfilter vf_drawtext: Fix memory leak 2017-03-21 12:15:50 +00:00
libavformat Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4' 2017-03-23 16:52:42 -03:00
libavresample Bump minor versions after 3.2 branchpoint to seperate release 2016-10-26 20:52:42 +02:00
libavutil Merge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4' 2017-03-23 18:05:27 -03:00
libpostproc Bump minor versions after 3.2 branchpoint to seperate release 2016-10-26 20:52:42 +02:00
libswresample swresample/resample: free existing ResampleContext on reinit 2017-03-21 12:03:44 -03:00
libswscale Merge commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414' 2017-03-21 08:24:39 +01:00
presets
tests Merge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055' 2017-03-23 18:01:47 -03:00
tools tools/target_dec_fuzzer: Fix misaligned read 2017-02-24 14:12:13 +01:00
.gitattributes fate: add SCC test 2017-01-27 17:06:42 +01:00
.gitignore Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1' 2016-06-26 15:43:05 +02:00
.travis.yml
arch.mak mips: rename mipsdspr1 to mipsdsp 2015-12-04 02:35:42 +01:00
Changelog add signature filter for MPEG7 video signature 2017-03-21 00:11:08 +01:00
cmdutils_common_opts.h cmdutils: add show_demuxers and show_muxers 2016-11-08 01:56:31 +01:00
cmdutils_opencl.c cmdutils_opencl: fix resource_leak cid 1396852 2017-01-13 07:54:49 +08:00
cmdutils.c cmdutils: remove duplicate windows.h include 2016-11-16 15:06:16 +01:00
cmdutils.h cmdutils: add show_demuxers and show_muxers 2016-11-08 01:56:31 +01:00
common.mak Merge commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81' 2017-03-23 17:57:35 -03:00
configure Merge commit 'de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0' 2017-03-21 14:43:53 +01:00
CONTRIBUTING.md Add CONTRIBUTING.md 2016-09-18 10:02:13 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_cuvid.c ffmpeg_cuvid: adapt for recent filter graph initialization changes 2017-03-03 08:45:43 +01:00
ffmpeg_dxva2.c Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28' 2016-06-26 15:34:01 +02:00
ffmpeg_filter.c ffmpeg: don't use resample_lavr_opts 2017-03-16 06:58:50 +00:00
ffmpeg_opt.c ffmpeg, ffprobe: don't "merge" side data into packet data by default 2017-03-14 23:37:28 +01:00
ffmpeg_qsv.c ffmpeg: init filtergraphs only after we have a frame on each input 2017-03-03 08:45:43 +01:00
ffmpeg_vaapi.c ffmpeg_vaapi: Always set hwaccel_ctx, so it gets properly cleaned up on error 2017-02-05 15:13:15 +00:00
ffmpeg_vdpau.c Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6' 2016-06-26 15:29:39 +02:00
ffmpeg_videotoolbox.c
ffmpeg.c Merge commit '27085d1b47c3741cc0fac284c916127c4066d049' 2017-03-22 16:05:06 +01:00
ffmpeg.h Merge commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0' 2017-03-12 13:08:04 +01:00
ffplay.c ffplay: change keyboard volume control to logarithmic 2017-02-08 22:36:42 +01:00
ffprobe.c fate: Do not report side data size 2017-03-17 13:12:25 -04:00
ffserver_config.c ffserver_config: Check for failure to allocate FFServerIPAddressACL 2016-12-22 19:23:08 +01:00
ffserver_config.h ffsrever: Make the status page bitexact if any stream is bitexact 2016-11-29 19:26:26 +01:00
ffserver.c ffserver: local OOB write with custom program name 2017-01-08 03:50:56 +01:00
INSTALL.md
library.mak Merge commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81' 2017-03-23 17:57:35 -03:00
LICENSE.md Merge commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c' 2017-03-15 22:07:47 +01:00
MAINTAINERS MAINTAINERS: Add Rodger Combs to ffmpeg-security 2017-02-28 01:13:52 +01:00
Makefile Makefile: Clean compat/atomics/pthread subdirectory. 2017-03-01 13:43:03 +01:00
README.md Add CONTRIBUTING.md 2016-09-18 10:02:13 +01:00
RELEASE RELEASE: Update for past 3.2 branch 2016-10-26 20:52:43 +02:00
version.sh version.sh: Fix spurious rebuilds. 2016-03-10 09:53:10 +01:00

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.