FFmpeg git repo
Go to file
Clément Bœsch a283665693 Merge commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195'
* commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195':
  avconv: Check that muxing_queue exists before reading from it

Mostly noop. This was fixed in FFmpeg in 7f7c494a3.

The merge makes the cosmetics match but does not include the weird
av_log().

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-15 14:28:43 +01:00
compat compat/cuda: fix ulong size on cygwin 2017-03-01 12:08:34 +01:00
doc doc/filters: Add colourspace values for colormatrix filter 2017-03-14 13:35:38 -08:00
libavcodec Merge commit '48b80f8393d418ad35d73f5a36f5011de1928f3c' 2017-03-15 12:34:51 +01:00
libavdevice avdevice/alldevices: make avdevice_register_all thread safe 2017-03-07 20:34:44 +07:00
libavfilter avfilter/vf_lut3d: actually skip lines when encountering DOMAIN_ string 2017-03-13 15:30:05 +01:00
libavformat avformat/hlsenc: fix duration wrong when no pkt duration 2017-03-15 07:37:11 +08:00
libavresample Bump minor versions after 3.2 branchpoint to seperate release 2016-10-26 20:52:42 +02:00
libavutil aarch64: Add parentheses around the offset parameter in movrel 2017-03-11 13:14:50 +02: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
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
.travis.yml
CONTRIBUTING.md
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog avcodec: add XPM decoder and demuxer 2017-03-12 18:24:49 +01:00
INSTALL.md
LICENSE.md lavfi/f_ebur128: relicense to LGPL 2016-11-27 20:46:20 +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
RELEASE RELEASE: Update for past 3.2 branch 2016-10-26 20:52:43 +02:00
arch.mak
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
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
common.mak
configure Merge commit '100fb0ddfda958da70f98feac81f924c02483789' 2017-03-15 12:50:04 +01: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
ffmpeg_cuvid.c ffmpeg_cuvid: adapt for recent filter graph initialization changes 2017-03-03 08:45:43 +01:00
ffmpeg_dxva2.c
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
ffmpeg_videotoolbox.c
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.c ffserver: local OOB write with custom program name 2017-01-08 03:50:56 +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
library.mak
version.sh

README.md

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.