1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Derek Buitenhuis 528af33b6f Merge commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1'
This commit is a no-op. wm4 is working to get these into ffmpeg
proper, with ffmpeg versions of the patches.

* commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1':
  lavf: use new decode API
  avconv: use new encode API
  avconv: use new decode API
  lavc: introduce a new decoding/encoding API with decoupled input/output

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-18 15:13:28 +01:00
compat compat/os2threads: split long lines 2016-02-14 19:17:36 +01:00
doc lavfi/perspective: Add basic timeline editing. 2016-04-17 21:12:34 +02:00
libavcodec avcodec/dump_extradata_bsf: Add back 'k' and 'e' options 2016-04-18 02:54:33 +02:00
libavdevice Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4' 2016-04-17 19:37:54 +01:00
libavfilter lavfi/perspective: Add basic timeline editing. 2016-04-17 21:12:34 +02:00
libavformat Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8' 2016-04-17 19:39:57 +01:00
libavresample Merge commit 'cc4c24208159200b7aff5b5c313903c7f23fa345' 2016-01-02 10:13:58 +01:00
libavutil Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7' 2016-04-17 19:40:53 +01:00
libpostproc postproc: fix unaligned access 2016-02-23 15:50:28 +01:00
libswresample swresample/swresample: Remove "less than" comparissions of enums 2016-03-22 14:20:12 +01:00
libswscale swscale/arm: add yuv2planeX_8_neon 2016-04-11 18:13:36 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4' 2016-04-17 19:37:54 +01:00
tools fix some a/an typos 2016-03-28 14:13:17 -08:00
.gitattributes Treat all '*.pnm' files as non-text file 2014-11-28 17:52:43 -05:00
.gitignore Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7' 2016-04-17 19:36:59 +01: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 avfilter: add readvitc filter 2016-04-16 16:22:43 +02:00
cmdutils_common_opts.h opts: add list device sources/sinks options 2014-10-25 20:20:31 +02:00
cmdutils_opencl.c all: use FFDIFFSIGN to resolve possible undefined behavior in comparators 2015-11-03 16:28:30 -05:00
cmdutils.c cmdutils: realign for some additional filters with very long name 2016-02-06 12:48:51 +01:00
cmdutils.h fate/source: Do not use GNU extensions in sed 2016-02-13 07:59:00 -08:00
common.mak build: use a link instead of changing current directory when compiling 2016-01-25 20:43:34 +01:00
configure Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8' 2016-04-17 19:39:57 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_dxva2.c ffmpeg_dxva2: add a profile check for hevc 2016-02-15 12:34:19 +01:00
ffmpeg_filter.c fix some a/an typos 2016-03-28 14:13:17 -08:00
ffmpeg_opt.c ffmpeg: remove hardcoded 'now' creation_time support 2016-03-03 01:37:22 +01:00
ffmpeg_qsv.c Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8' 2015-10-22 16:18:02 +02:00
ffmpeg_vdpau.c ffmpeg_vdpau: Free ctx on error path 2016-03-03 16:41:11 +01: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 '9200514ad8717c63f82101dc394f4378854325bf' 2016-04-10 20:59:55 +01:00
ffmpeg.h Merge commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140' 2016-02-17 16:47:05 +00:00
ffplay.c ffplay: convert to codecpar 2016-04-12 23:41:15 +02:00
ffprobe.c ffprobe: Don't try and decode things that have no dec_ctx 2016-04-12 17:24:07 +01: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: Use singlejpeg muxer for jpeg 2015-06-08 03:36:22 +02:00
ffserver.c Merge commit '9200514ad8717c63f82101dc394f4378854325bf' 2016-04-10 20:59:55 +01:00
INSTALL.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak build: use a link instead of changing current directory when compiling 2016-01-25 20:43:34 +01:00
LICENSE.md LICENSE: Thorough editing 2016-02-28 08:19:44 -08:00
MAINTAINERS avfilter: add readvitc filter 2016-04-16 16:22:43 +02:00
Makefile fate: add audiomatch 2016-03-22 09:42:05 +01:00
README.md README: replace http with https 2015-10-06 13:27:29 +02:00
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.