mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-11 17:30:00 +01:00

Go to file

Michael Niedermayer a0fe1a25fa Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
  avformat: Don't anonymously typedef structs

Conflicts:
	libavformat/adtsenc.c
	libavformat/aiffenc.c
	libavformat/avidec.c
	libavformat/gif.c
	libavformat/iff.c
	libavformat/img2dec.c
	libavformat/jvdec.c
	libavformat/matroskadec.c
	libavformat/udp.c
	libavformat/wtvdec.c

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

2015-02-14 21:07:40 +01:00

compat

compat/avisynth/avxsynth_c: Clear all unused fields in returned structs

2014-12-11 16:12:47 +01:00

doc

avfilter: add paletteuse filter

2015-02-14 20:48:50 +01:00

libavcodec

avcodec/gif: support crop and transparency with PAL8

2015-02-14 20:48:50 +01:00

libavdevice

avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__

2015-02-08 04:52:52 +01:00

libavfilter

avfilter: bump minor and Changelog document the new filters

2015-02-14 20:49:08 +01:00

libavformat

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

libavresample

Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

2014-10-18 22:53:23 +02:00

libavutil

Merge commit '0232ba62a28527579e34d44700b48017cc727e5f'

2015-02-11 01:32:30 +01:00

libpostproc

Add FFMPEG_VERSION into the binary libs

2014-12-19 19:32:40 +01:00

libswresample

swresample/x86/rematrix_init: Check av_malloc* return codes, forward errors

2015-02-09 10:15:56 +01:00

libswscale

swscale/utils: Limit filter shifting so as not to read from prior the array

2015-02-05 00:33:50 +01:00

presets

presets: remove moldering iPod presets

2014-06-17 16:15:04 -08:00

tests

avcodec/gif: support crop and transparency with PAL8

2015-02-14 20:48:50 +01:00

tools

tools/crypto_bench: add Camellia support

2015-01-26 13:37:57 -03: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

avfilter: bump minor and Changelog document the new filters

2015-02-14 20:49:08 +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

Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'

2014-05-20 03:33:30 +02:00

configure

avfilter: Add repeatfields filter (Port of mp=softpulldown)

2015-02-10 19:07:20 +01:00

COPYING.GPLv2

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00:00

COPYING.GPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

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: Make CFR frame drop threshold user adjustable

2015-02-04 02:40:41 +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: Print negative times like "-00:05:01.22" instead of "00:-5:-1.-22"

2015-02-11 11:22:27 +01:00

ffmpeg.h

ffmpeg: Make CFR frame drop threshold user adjustable

2015-02-04 02:40:41 +01:00

ffplay.c

ffplay: factorize thread starting and stopping code into decoder

2015-02-10 20:50:48 +01:00

ffprobe.c

stop embedding the build date

2015-02-02 05:04:14 +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: reflow find_stream_in_feed()

2015-01-24 02:22:09 -03:00

INSTALL.md

INSTALL: add markdown syntax

2014-05-28 22:38:38 +02:00

library.mak

Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'

2014-07-22 02:45:45 +02:00

LICENSE.md

LICENSE.md: Formatting updates

2015-02-12 01:53:56 +01:00

MAINTAINERS

avformat/rtpdec_ac3: add AC3 RTP depacketization (RFC 4184)

2015-02-14 20:13:52 +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

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%