1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer b1b58310d0 Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'
* commit '8d26c193fb42d08602ac93ece039d4718d029adc':
  avdevice: Apply a more consistent file naming scheme

Conflicts:
	libavdevice/Makefile
	libavdevice/alsa.h
	libavdevice/alsa_dec.c
	libavdevice/alsa_enc.c
	libavdevice/sndio_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 21:36:42 +02:00
compat avisynth: drop support of AviSynth 2.5 2015-03-25 20:37:26 +01:00
doc lavf: Add support for WebM Live Muxing 2015-04-07 15:08:59 +02:00
libavcodec Merge commit '5980c924e309ae1dde8bd52d9938f94ff02602eb' 2015-04-09 20:26:18 +02:00
libavdevice Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
libavfilter avfilter/vsrc_life: Fix mix of declarations and statements 2015-04-09 11:40:44 +02:00
libavformat Merge commit '27852f2f1dec3749ea79883b70484c841169f747' 2015-04-09 20:58:11 +02:00
libavresample Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08' 2015-02-22 00:06:23 +01:00
libavutil avutil/x86/Makefile: fix conditional x86/emms.o build 2015-04-09 01:12:51 +02:00
libpostproc postproc: Removed unecessary if/else branch when getting QP. 2015-03-28 01:49:12 +01:00
libswresample swr/resample: use av_clip functions 2015-04-05 22:46:40 +02:00
libswscale swscale/output: Fix undefined shifts 2015-03-25 18:31:25 +01:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests hqx: Fix clipping error in idct put function 2015-04-09 13:52:04 +02:00
tools tools/sidxindex: Use av_*malloc_array() 2015-04-01 17:43:25 +02:00
.gitattributes Treat all '*.pnm' files as non-text file 2014-11-28 17:52:43 -05:00
.gitignore doc/examples: add directory listing example 2015-03-28 03:13:44 +01:00
arch.mak configure, mips: remove MIPS32R2, merging it with MIPSFPU 2015-03-06 14:01:31 +01:00
Changelog avcodec/nvenc: Add options for level and tier 2015-04-09 18:20:26 +02: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 "Commmand" typo 2015-04-03 10:43:21 -08:00
cmdutils.h opts: add list device sources/sinks options 2014-10-25 20:20:31 +02:00
common.mak x86: Makefile: fix DBG parameter evaluation 2015-03-11 01:54:07 +01:00
configure parseutils: Make av_small_strptime public 2015-04-07 12:36:11 +02: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 Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035' 2015-04-04 00:38:02 +02:00
ffmpeg_vda.c vda: Cast to not discard constant qualifier and silence compiler warning 2015-04-09 01:23:33 +02:00
ffmpeg_vdpau.c Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec' 2014-12-27 13:26:38 +01:00
ffmpeg.c Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035' 2015-04-04 00:38:02 +02:00
ffmpeg.h ffmpeg: last frame duplication heuristic 2015-04-03 19:09:31 +02:00
ffplay.c Merge commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7' 2015-03-22 03:51:49 +01:00
ffprobe.c Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f' 2015-03-08 23:58:18 +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: remove stale debug stanza 2015-03-08 18:24:56 -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 Lou Logan as server admin as he is root too 2015-04-06 20:24:05 +02:00
Makefile configure, mips: remove MIPS32R2, merging it with MIPSFPU 2015-03-06 14:01:31 +01:00
README.md README: add ffserver 2015-02-12 11:59:22 +01:00
RELEASE RELEASE: update to 2.6.git 2015-03-08 18:59:57 -03: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.