1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
James Almer 7c5adf6c88 Merge commit '2dbe2aa2c2d4f02d2669feae45dee4fc45414813'
* commit '2dbe2aa2c2d4f02d2669feae45dee4fc45414813':
  rdt: Convert to the new bitstream reader
  ogg: Convert to the new bitstream reader
  mpegts: Convert to the new bitstream reader
  xsubdec: Convert to the new bitstream reader
  xan: Convert to the new bitstream reader
  wnv1: Convert to the new bitstream reader
  vima: Convert to the new bitstream reader
  vble: Convert to the new bitstream reader
  utvideodec: Convert to the new bitstream reader
  twinvq: Convert to the new bitstream reader
  tscc2: Convert to the new bitstream reader
  truespeech: Convert to the new bitstream reader
  tiertex: Convert to the new bitstream reader
  truemotion2: Convert to the new bitstream reader
  svq1dec: Convert to the new bitstream reader
  smacker: Convert to the new bitstream reader
  sipr: Convert to the new bitstream reader
  rtjpeg: Convert to the new bitstream reader
  ra288: Convert to the new bitstream reader
  ra144: Convert to the new bitstream reader

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: James Almer <jamrial@gmail.com>
2017-04-04 15:51:14 -03:00
compat stdatomic/win32: only include the lean windows headers to avoid conflicts 2017-04-04 09:33:23 +02:00
doc Merge commit '286ab878bd39b56008035638227b3ecb8ec5bbb7' 2017-04-04 15:03:34 -03:00
libavcodec lavc: add AV_ prefix to CODEC_CAP_DELAY in doxy 2017-04-04 09:58:29 +02:00
libavdevice Bump versions for master after 3.3 2017-04-02 19:54:12 +02:00
libavfilter avfilter/vf_pad: add aspect option 2017-04-03 22:35:34 +02:00
libavformat avformat/mov: Check creation_time for overflow 2017-04-04 00:56:21 +02:00
libavresample Merge commit 'a1d9de304fe63614e3aa8117fef17491fa80093d' 2017-04-03 20:41:16 +02:00
libavutil Merge commit 'a1d9de304fe63614e3aa8117fef17491fa80093d' 2017-04-03 20:41:16 +02:00
libpostproc Bump versions for master after 3.3 2017-04-02 19:54:12 +02:00
libswresample Bump versions for master after 3.3 2017-04-02 19:54:12 +02:00
libswscale Bump versions for master after 3.3 2017-04-02 19:54:12 +02:00
presets
tests Merge commit 'effc1430b2fe5997d9d55bf28dc507c27125eb27' 2017-04-04 15:26:18 -03:00
tools tools/fourcc2pixfmt: fix usages of av_get_codec_tag_string() 2017-03-29 14:49:29 +02:00
.gitattributes
.gitignore
.travis.yml
arch.mak
Changelog Changelog: fix position of VAAPI MPEG-2/VP8 encode entry 2017-04-02 23:18:42 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '1dd2b6c91ca5f26207805720d4f5564de60b241b' 2017-04-03 21:07:59 +02:00
CONTRIBUTING.md
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_cuvid.c
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c Merge commit '01348e411f962f5e4605d649fc9a47a54587ba8e' 2017-03-31 16:46:00 -03:00
ffmpeg_qsv.c
ffmpeg_vaapi.c
ffmpeg_vdpau.c
ffmpeg_videotoolbox.c ffmpeg_videotoolbox: fix usage of av_get_codec_tag_string() 2017-03-29 14:49:29 +02:00
ffmpeg.c ffmpeg: make transcode_init_done atomic. 2017-04-03 09:38:10 -04:00
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: port to new decode API 2017-04-04 07:47:28 +02:00
ffserver_config.c
ffserver_config.h
ffserver.c
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS
Makefile
README.md
RELEASE Bump minor versions for master after release/3.3 branchpoint 2017-03-31 13:21:06 +02:00
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 and will be ignored.