Go to file

Michael Niedermayer 76fa78911f Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'

* commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67':
  display: fix order of operands

Conflicts:
	libavcodec/h264.c

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

2014-11-13 12:53:31 +01:00

compat

compat/w32pthreads: use the condition variable API directly when targeting newer versions of Windows

2014-10-09 17:51:46 -03:00

doc

doc/filters: explicit and complete xBR documentation

2014-11-10 06:36:31 +01:00

libavcodec

Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'

2014-11-13 12:53:31 +01:00

libavdevice

lavd/avfoundation: Remove unused -frame_rate option.

2014-11-12 09:55:11 +01:00

libavfilter

lavfi/xbr: apply misc cosmetical fixes

2014-11-10 11:55:53 +01:00

libavformat

lavf/tcp: Clarify that the -timeout option takes microseconds.

2014-11-12 13:52:56 +01:00

libavresample

Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

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

libavutil

lavu/opt: fix av_opt_get function

2014-11-12 23:34:05 +01:00

libpostproc

postproc: fix qp count

2014-10-13 16:12:30 +02:00

libswresample

x86/swr: add ff_float_to_int32_a_avx2

2014-11-07 15:01:35 -03:00

libswscale

swscale/utils: support bayer input + scaling, and bayer input + any supported output

2014-11-12 23:59:37 +01:00

presets

presets: remove moldering iPod presets

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

tests

lavf/webmdashenc: Representation IDs should be unique.

2014-11-12 00:21:37 +01:00

tools

tools/ffhash: read errno before calling functions which might change it

2014-10-25 16:12:16 +02:00

.gitignore

gitignore: add test_copy.ffmeta

2014-10-17 15:57:12 +02:00

arch.mak

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

2014-04-07 02:15:18 +02:00

Changelog

Changelog: explicit that xBR scaler is implemented as a filter

2014-11-10 06:24:54 +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

opts: add list device sources/sinks options

2014-10-25 20:20:31 +02: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

configure: Hack to treat x32 as x86_64.

2014-11-12 09:53:01 +01: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

Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643'

2014-04-30 00:46:38 +02:00

ffmpeg_filter.c

ffmpeg: init sub2video.last_pts.

2014-11-05 21:04:36 +01:00

ffmpeg_opt.c

Set -scan_all_pmts 1 in ffmpeg, ffplay and ffprobe if not set by user.

2014-11-09 18:28:29 +01:00

ffmpeg_vda.c

Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

2014-05-12 02:44:28 +02:00

ffmpeg_vdpau.c

Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd'

2014-10-06 16:31:51 +02:00

ffmpeg.c

Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'

2014-10-24 13:14:33 +02:00

ffmpeg.h

ffmpeg: add vdpau_old to allow continued testing of the older (but not oldest) API

2014-10-06 16:09:02 +02:00

ffplay.c

ffplay: signal the frame queue before closing audio

2014-11-11 23:02:00 +01:00

ffprobe.c

Set -scan_all_pmts 1 in ffmpeg, ffplay and ffprobe if not set by user.

2014-11-09 18:28:29 +01:00

ffserver_config.c

ffserver_config: report not closed last tag

2014-11-12 23:33:08 +01:00

ffserver_config.h

ffserver_config: improve AVOption handing

2014-11-03 00:32:25 +01:00

ffserver.c

ffserver: move configuration code to separate file

2014-10-22 22:37:40 +02: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

lavfi: add xbr filter xBR

2014-11-10 03:45:00 +01:00

MAINTAINERS

MAINTAINERS: Add myself as maintainer for Icecast protocol

2014-11-11 19:32:30 +01:00

Makefile

ffserver: move configuration code to separate file

2014-10-22 22:37:40 +02:00

README.md

README: fix 2 typo in the doc/examples sentence

2014-11-03 09:21:45 +01:00

RELEASE

RELEASE: update to 2.4.git

2014-09-15 13:11:10 -03:00

RELEASE_NOTES

Changelog/RELEASE_NOTES: prepare for 2.4

2014-09-14 13:41:49 +02: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 analisys tool to inspect multimedia content.
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%