Go to file

Michael Niedermayer 63ea3a86b7 Merge commit '9c09fbd8053292267cdc4b542913ceced43ea3a9'

* commit '9c09fbd8053292267cdc4b542913ceced43ea3a9':
  rtpdec: experimental VP9 depacketizer (draft 0)

Conflicts:
	libavformat/rtpdec.c
	libavformat/rtpdec_vp9.c
	libavformat/version.h

See: e4a6486c17dd90b338450ac7e151ffbf5370948a
See: f966ac2b6e3f08c41f3c45ab5efff768db62ac5a
See: 629a03a9128bd2e51286258e12183b1d06f509a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-03-05 10:12:53 +01:00

compat

compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments

2015-02-18 01:49:35 +01:00

doc

avformat: add avformat_flush()

2015-03-05 00:09:26 +01:00

libavcodec

Merge commit 'f3b74d944bdef9bbe81f7690f8d837d843ec13a6'

2015-03-05 02:17:01 +01:00

libavdevice

Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'

2015-03-02 20:16:22 +01:00

libavfilter

vf_showinfo: minimum widths for some early fields

2015-03-04 21:43:42 +01:00

libavformat

Merge commit '9c09fbd8053292267cdc4b542913ceced43ea3a9'

2015-03-05 10:12:53 +01:00

libavresample

Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08'

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

libavutil

pixelutils: Comment on (lack of) sad_8x8_sse2

2015-03-04 21:58:53 +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

Merge commit '62139b14e621f096d0f8ed90920d042b92867e40'

2015-03-04 19:05:28 +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 '9c09fbd8053292267cdc4b542913ceced43ea3a9'

2015-03-05 10:12:53 +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

Allow AVFoundation compilation on OS X 10.7.

2015-03-04 23:54:10 +01: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: 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: comment mpeg4 hack

2015-03-03 20:25:28 +01:00

ffmpeg.h

ffmpeg: allow to set the thread message queue size.

2015-02-26 19:19:56 +01:00

ffplay.c

ffplay: Switch to show waves mode if allocation/init of RDFT fails

2015-03-04 03:04:04 +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

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 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%