1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Clément Bœsch ae753dbd0d Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'
* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40':
  get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes

The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:35:10 +02:00
compat Merge commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43' 2016-05-08 23:02:33 +01:00
doc Update FFmpeg 3.1 cut marker 2016-06-26 14:45:54 -03:00
libavcodec Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40' 2016-06-29 11:35:10 +02:00
libavdevice avdevice/decklink_common: Replace rare spelling of Succesfully by 500 times more common one 2016-06-28 03:07:54 +02:00
libavfilter Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24' 2016-06-27 17:56:47 +02:00
libavformat Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40' 2016-06-29 11:35:10 +02:00
libavresample Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24' 2016-06-27 17:56:47 +02:00
libavutil Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24' 2016-06-27 17:56:47 +02:00
libpostproc Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24' 2016-06-27 17:56:47 +02:00
libswresample Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24' 2016-06-27 17:56:47 +02:00
libswscale Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24' 2016-06-27 17:56:47 +02:00
presets
tests Merge commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9' 2016-06-29 11:05:49 +02:00
tools Merge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8' 2016-06-23 12:14:45 +02:00
.gitattributes
.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 Changelog: Add VideoToolbox encoder entry for 3.1 2016-06-27 11:43:13 -04:00
cmdutils_common_opts.h
cmdutils_opencl.c all: use FFDIFFSIGN to resolve possible undefined behavior in comparators 2015-11-03 16:28:30 -05:00
cmdutils.c avconv: switch to the new BSF API 2016-03-20 08:15:01 +01:00
cmdutils.h fate/source: Do not use GNU extensions in sed 2016-02-13 07:59:00 -08:00
common.mak Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1' 2016-06-27 19:39:46 +02:00
configure Merge commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5' 2016-06-27 19:48:21 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_cuvid.c ffmpeg: Add cuvid hwaccel support 2016-06-10 16:31:23 +02:00
ffmpeg_dxva2.c Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28' 2016-06-26 15:34:01 +02:00
ffmpeg_filter.c ffmpeg_filter: Fix AVBufferSrcParameters leak 2016-05-19 00:10:27 +02:00
ffmpeg_opt.c ffmpeg: Add cuvid hwaccel support 2016-06-10 16:31:23 +02:00
ffmpeg_qsv.c
ffmpeg_vaapi.c Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd' 2016-06-26 15:36:27 +02:00
ffmpeg_vdpau.c Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6' 2016-06-26 15:29:39 +02:00
ffmpeg_videotoolbox.c
ffmpeg.c ffmpeg: do not use deprecated AVSubtitleRect.pict 2016-06-25 13:35:46 +02:00
ffmpeg.h ffmpeg: Add cuvid hwaccel support 2016-06-10 16:31:23 +02:00
ffplay.c Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 2016-06-21 21:55:34 +02:00
ffprobe.c ffprobe: print stereo3d information 2016-06-23 13:48:14 +02:00
ffserver_config.c ffserver: NoVideo and NoAudio flags weren't cleared between streams. 2016-02-21 22:29:15 +01:00
ffserver_config.h
ffserver.c ffserver: fixed deallocation bug in build_feed_streams 2016-05-27 00:22:06 +02:00
INSTALL.md
library.mak Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1' 2016-06-27 19:39:46 +02:00
LICENSE.md avcodec: remove libutvideo wrapper support 2016-06-23 13:04:11 +02:00
MAINTAINERS MAINTAINERS: remove 2.4 as 3.1 was released 2016-06-27 22:51:39 +02:00
Makefile Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1' 2016-06-26 15:43:05 +02:00
README.md
RELEASE RELEASE: Update to 3.0.git 2016-02-15 10:20:33 -08: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. Few developers follow pull requests so they will likely be ignored.