1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer cb39fe9336 Merge commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42'
* commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42':
  Revert "mov: Change DTS-based seek into CTS-based seek."

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-02 20:52:34 +01:00
compat compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments 2015-02-18 01:49:35 +01:00
doc Merge commit '990e4a6639d0714198583c2812b1074b5751898f' 2015-03-01 00:30:20 +01:00
libavcodec Merge commit 'dbc1163b203b175d246b7454c32ac176f84006d1' 2015-03-02 20:01:28 +01:00
libavdevice Merge commit '619d5e7db88941cadb8136f805564e885c6c6434' 2015-03-02 20:16:22 +01:00
libavfilter avfilter/af_aphaser: Change type to int as its accessed as int via AVOptions 2015-03-02 04:08:32 +01:00
libavformat Merge commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42' 2015-03-02 20:52:34 +01:00
libavresample Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08' 2015-02-22 00:06:23 +01:00
libavutil avutil/common: minor simplification in av_clip_intp2_c() 2015-03-02 01:07:50 +01:00
libpostproc postproc: mark alloc/free context functions as av_cold 2015-02-27 16:15:31 +01:00
libswresample swresample: Add prefix to soxr_resampler 2015-02-27 19:20:43 +01:00
libswscale swscale: Add prefix to updateMMXDitherTables() 2015-02-27 19:23:46 +01:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests avcodec/aacpsy: Fix AAC Psy PE reduction calculation when multiple iterations are required 2015-03-02 13:31:31 +01:00
tools tools/graph2dot: Check for av_malloc() failure 2015-02-22 22:51:13 +01:00
.gitattributes Treat all '*.pnm' files as non-text file 2014-11-28 17:52:43 -05:00
.gitignore Merge commit '11e05533170485b593974cf90916425a0188e7bd' 2015-02-02 21:16:15 +01:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog Merge commit '04a1be8e28e81f3967eace7705343c450616cc95' 2015-02-24 21:55:46 +01:00
cmdutils_common_opts.h opts: add list device sources/sinks options 2014-10-25 20:20:31 +02:00
cmdutils_opencl.c cmdutils_opencl: Use av_malloc_array() 2014-07-01 03:49:36 +02:00
cmdutils.c cmdutils: fix success path 2015-02-11 17:28:11 +01:00
cmdutils.h opts: add list device sources/sinks options 2014-10-25 20:20:31 +02:00
common.mak Makefile: improve DBG option for asm 2015-02-21 03:23:55 +01:00
configure configure/help: consistently use "autodetect" 2015-03-02 14:56:05 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
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 hevc support 2015-01-27 12:37:34 +01:00
ffmpeg_filter.c ffmpeg: fix accurate seeking with -copyts 2014-11-24 17:31:26 +01:00
ffmpeg_opt.c ffmpeg: allow to set the thread message queue size. 2015-02-26 19:19:56 +01:00
ffmpeg_vda.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec' 2014-12-27 13:26:38 +01:00
ffmpeg.c ffmpeg: Fix -vstats when coded_frame is not set 2015-02-28 12:33:44 +01:00
ffmpeg.h ffmpeg: allow to set the thread message queue size. 2015-02-26 19:19:56 +01:00
ffplay.c Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4' 2015-02-17 21:16:34 +01:00
ffprobe.c ffprobe: Change string_validation to int, its accessed via AVOption as int 2015-03-02 04:06:39 +01:00
ffserver_config.c ffserver_config: reflow add_codec() 2014-12-09 01:03:01 -03:00
ffserver_config.h ffserver: dont leak child arguments 2014-11-26 23:32:33 +01:00
ffserver.c ffserver: fix wrong indentation 2015-02-15 15:15:41 -03:00
INSTALL.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak x86/doc/Makefile: DBG=1 to preprocess external asm 2015-02-17 13:08:04 +01:00
LICENSE.md LICENSE.md: Formatting updates 2015-02-12 01:53:56 +01:00
MAINTAINERS MAINTAINERS: add myself as rtpdec_mpa_robust maintainer 2015-03-02 11:58:49 +01:00
Makefile Makefile: add dependencies which require ffversion.h 2014-12-20 04:17:03 +01:00
README.md README: add ffserver 2015-02-12 11:59:22 +01:00
RELEASE RELEASE: Bump 2014-12-04 11:44:35 +01:00
RELEASE_NOTES avformat/mov: Disable XMP metadata by default 2014-12-11 21:47:37 +01:00
version.sh version.sh: Print versions based on the last git tag for release branches 2014-07-28 15:44:59 +02: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.