mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00

Go to file

Michael Niedermayer a105931d3e Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'

* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8':
  build: Split JPEG-related tables off into a separate component

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-03-31 01:11:02 +02:00

compat

avisynth: drop support of AviSynth 2.5

2015-03-25 20:37:26 +01:00

doc

lavf: Bump minor version and document directory listing API in doc/APIchanges.

2015-03-30 23:02:53 +02:00

libavcodec

Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'

2015-03-31 01:11:02 +02:00

libavdevice

avdevice/avfoundation: Fix occured typo

2015-03-30 21:41:17 +02:00

libavfilter

avfilter/vf_vignette: Change enum to int, which is accessed via AVOption as int

2015-03-30 21:58:42 +02:00

libavformat

Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'

2015-03-31 01:11:02 +02:00

libavresample

Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08'

2015-02-22 00:06:23 +01:00

libavutil

avutil/hmac: Check av_hmac_alloc() return code

2015-03-30 23:24:33 +02:00

libpostproc

postproc: Removed unecessary if/else branch when getting QP.

2015-03-28 01:49:12 +01:00

libswresample

swresample/swresample: Use av_mallocz_array()

2015-03-30 23:24:33 +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

libavformat/mxfenc.c: Add 'Presentation Y offset' metadata

2015-03-30 15:03:41 +02:00

tools

Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b'

2015-03-19 14:00:39 +01: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

Merge commit '72025ac36c740f031d7e413041fdfe97087c83c4'

2015-03-29 13:01: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: Add a stream specifier to map usable streams

2015-03-20 16:10:20 +01: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

Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'

2015-03-31 01:11:02 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

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_opt: Do not overwrite output if there is no input

2015-03-28 23:00:07 +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

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: 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

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

version.sh: Print versions based on the last git tag for release branches

2014-07-28 15:44:59 +02:00

README.md

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.

Languages

C 89.9%

Assembly 8.1%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%