1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Go to file
Michael Niedermayer 4ecc9a2f31 Merge commit 'db21dde3f72c2331653399bdb8745350f015d847'
* commit 'db21dde3f72c2331653399bdb8745350f015d847':
  qsvdec_mpeg2: drop an incorrect comment

Conflicts:
	libavcodec/qsvdec_mpeg2.c

No change as the removed comment was not in libavcodec/qsvdec_mpeg2.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28 00:13:14 +02:00
compat
doc Merge commit 'b94ec30428b9696f99b08055735689623fe63954' 2015-07-27 23:21:23 +02:00
libavcodec Merge commit '3ee217853a6741b829a2683f49c590618891b1ab' 2015-07-27 23:53:55 +02:00
libavdevice Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba' 2015-07-27 23:15:19 +02:00
libavfilter Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
libavformat Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba' 2015-07-27 23:15:19 +02:00
libavresample
libavutil x86/float_dsp: add missing colon to labels 2015-07-26 02:51:08 -03:00
libpostproc
libswresample swresample/x86: add missing colon to labels 2015-07-26 02:51:13 -03:00
libswscale swscale/output: Fix "warning: assignment from incompatible pointer type" 2015-07-25 03:15:56 +02:00
presets
tests AAC Encoder: clipping avoidance 2015-07-27 19:13:48 +02:00
tools
.gitattributes
.gitignore
arch.mak
Changelog avfilter: add acrossfade filter 2015-07-26 21:54:13 +00:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c Merge commit 'def97856de6021965db86c25a732d78689bd6bb0' 2015-07-27 22:50:18 +02:00
cmdutils.h
common.mak
configure Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c' 2015-07-27 13:20:12 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c Merge commit 'def97856de6021965db86c25a732d78689bd6bb0' 2015-07-27 22:50:18 +02:00
ffmpeg_opt.c Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba' 2015-07-27 23:15:19 +02:00
ffmpeg.h
ffplay.c Merge commit 'def97856de6021965db86c25a732d78689bd6bb0' 2015-07-27 22:50:18 +02:00
ffprobe.c
ffserver_config.c
ffserver_config.h
ffserver.c Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba' 2015-07-27 23:15:19 +02:00
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS
Makefile
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.