FFmpeg git repo
Go to file
Michael Niedermayer 97a407f696 Merge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d'
* commit '6fe2641d6e410b7bc203138fa97e1118b411f16d':
  lavc: add profile define for DTS Express

Conflicts:
	doc/APIchanges
	libavcodec/version.h

See: 11fe56c8bb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29 12:24:33 +02:00
compat avisynth: drop support of AviSynth 2.5 2015-03-25 20:37:26 +01:00
doc Merge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d' 2015-03-29 12:24:33 +02:00
libavcodec Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1' 2015-03-29 11:32:24 +02:00
libavdevice libavdevice/avfoundation: use pts/dts provided by the CMSampleBuffer API 2015-03-29 04:08:33 +02:00
libavfilter vfilter/vf_qp: Support evaluating expression per MB 2015-03-28 15:18:58 +01:00
libavformat avformat/avio: Document the end of list case in avio_read_dir() 2015-03-27 21:34:23 +01:00
libavresample Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08' 2015-02-22 00:06:23 +01:00
libavutil Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1' 2015-03-29 11:32:24 +02:00
libpostproc postproc: Removed unecessary if/else branch when getting QP. 2015-03-28 01:49:12 +01:00
libswresample swresample/resample: Fix undefined shifts 2015-03-14 01:15:37 +01:00
libswscale swscale/output: Fix undefined shifts 2015-03-25 18:31:25 +01:00
presets
tests fate/filter-video: Use qp filter to generate non constant qp array for more throughout testing of the pp filter 2015-03-28 15:29:56 +01:00
tools Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b' 2015-03-19 14:00:39 +01:00
.gitattributes
.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 Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1' 2015-03-29 11:32:24 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c cmdutils: Add a stream specifier to map usable streams 2015-03-20 16:10:20 +01:00
cmdutils.h
common.mak x86: Makefile: fix DBG parameter evaluation 2015-03-11 01:54:07 +01:00
configure Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1' 2015-03-29 11:32:24 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: Do not overwrite output if there is no input 2015-03-28 23:00:07 +01:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995' 2015-03-20 20:33:27 +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 '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.h
ffserver.c ffserver: remove stale debug stanza 2015-03-08 18:24:56 -03:00
INSTALL.md
library.mak x86/doc/Makefile: DBG=1 to preprocess external asm 2015-02-17 13:08:04 +01:00
LICENSE.md
MAINTAINERS Add 2.6 to maintained releases 2015-03-06 17:42:36 +01: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

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.