1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Timothy Gu e5c79cd854 Merge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae'
* commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae':
  avconv: fix handling attachments in init_output_stream

Conflicts:
	avconv.c

This is functionally a no-op, as we don't have the bug this is trying to
fix. See 843be56ee1.

Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 21:28:43 -07:00
compat
doc doc/filters: Fix option ranges for the sab filter. 2016-08-03 15:20:38 +02:00
libavcodec Merge commit '58640fe89ec4f2a3d67c0a2585fca8de34440857' 2016-08-03 20:07:21 -07:00
libavdevice decklink: Remove unneeded spaces in initializers 2016-08-02 22:46:28 -07:00
libavfilter avfilter/af_astats: extend bitdepth calculation 2016-08-03 20:32:43 +02:00
libavformat avformat/teeproto: Support parsing protocol options 2016-08-03 19:40:26 +02:00
libavresample doxygen: Standardize root-level modules 2016-08-02 22:15:25 -07:00
libavutil doxygen: Standardize root-level modules 2016-08-02 22:15:25 -07:00
libpostproc doxygen: Standardize root-level modules 2016-08-02 22:15:25 -07:00
libswresample doxygen: Standardize root-level modules 2016-08-02 22:15:25 -07:00
libswscale doxygen: Standardize root-level modules 2016-08-02 22:15:25 -07:00
presets
tests fate: add test for tremolo filter 2016-08-02 12:50:04 +02:00
tools tools/patcheck: add a couple more common typos 2016-07-17 18:38:14 -03:00
.gitattributes
.gitignore Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1' 2016-06-26 15:43:05 +02:00
.travis.yml
arch.mak
Changelog Changelog: add entry for MediaCodec hwaccel 2016-07-28 16:11:52 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1' 2016-06-27 19:39:46 +02:00
configure Add an OpenH264 decoder wrapper 2016-07-27 10:19:40 +03:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_cuvid.c
ffmpeg_dxva2.c
ffmpeg_filter.c Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge 2016-08-03 20:53:03 -07:00
ffmpeg_opt.c Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge 2016-08-03 20:53:03 -07:00
ffmpeg_qsv.c
ffmpeg_vaapi.c Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd' 2016-06-26 15:36:27 +02:00
ffmpeg_vdpau.c
ffmpeg_videotoolbox.c
ffmpeg.c Merge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae' 2016-08-03 21:28:43 -07:00
ffmpeg.h Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge 2016-08-03 20:53:03 -07:00
ffplay.c ffplay: Fix invalid array index 2016-08-03 16:09:03 +02:00
ffprobe.c ffprobe: add missing PROGRAM_STREAM_TAGS case 2016-07-26 19:22:47 +02:00
ffserver_config.c
ffserver_config.h
ffserver.c
INSTALL.md
library.mak Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1' 2016-06-27 19:39:46 +02:00
LICENSE.md
MAINTAINERS MAINTAINERS: Add myself for af_hdcd 2016-08-01 19:47:54 +02:00
Makefile Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1' 2016-06-26 15:43:05 +02:00
README.md
RELEASE
version.sh

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.