1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
James Almer 86fb169df5 Merge commit '9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d'
* commit '9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d':
  Revert "Don't use expressions with side effects in macro parameters"

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2017-03-15 21:33:13 -03:00
compat compat/cuda: fix ulong size on cygwin 2017-03-01 12:08:34 +01:00
doc doc: remove remaining legacy x11grab references 2017-03-15 22:23:00 +01:00
libavcodec avcodec/tiff: Check palette shift 2017-03-16 01:04:35 +01:00
libavdevice Merge commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688' 2017-03-15 22:19:56 +01:00
libavfilter avfilter/vf_lut3d: actually skip lines when encountering DOMAIN_ string 2017-03-13 15:30:05 +01:00
libavformat Merge commit 'ed1cd81076434b76f37576d4d806973476a8e96c' 2017-03-15 23:17:32 +01:00
libavresample Bump minor versions after 3.2 branchpoint to seperate release 2016-10-26 20:52:42 +02:00
libavutil Merge commit 'f79d847400d218cfd0b95f10358fe6e65ec3c9c4' 2017-03-15 21:20:44 -03:00
libpostproc Bump minor versions after 3.2 branchpoint to seperate release 2016-10-26 20:52:42 +02:00
libswresample swresample/swresample: do not reset tsf on swr_alloc_set_opts 2017-03-13 02:45:36 +07:00
libswscale lsws/slice: Move a misplaced const. 2017-03-08 00:33:21 +01:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests Merge commit '40ad05bab206c932a32171d45581080c914b06ec' 2017-03-15 12:32:15 +01: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 Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec' 2015-11-22 17:12:24 +00:00
arch.mak mips: rename mipsdspr1 to mipsdsp 2015-12-04 02:35:42 +01:00
Changelog Merge commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c' 2017-03-15 22:07:47 +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 'c5fd4b50610f62cbb3baa4f4108139363128dea1' 2016-06-27 19:39:46 +02:00
configure configure: libnpp is always nonfree, even with LGPL 2017-03-15 19:53:12 -03: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 Merge commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0' 2017-03-12 13:08:04 +01: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/videotoolbox: protect UTGetOSTypeFromString on both VDA and VT 2015-10-15 10:22:31 +02:00
ffmpeg.c Merge commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195' 2017-03-15 14:28:43 +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 ffmpeg, ffprobe: don't "merge" side data into packet data by default 2017-03-14 23:37:28 +01: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 INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1' 2016-06-27 19:39:46 +02: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.