Go to file

Michael Niedermayer 2e97437657 Merge commit '87bd298abeb901fe16383a0d267502cc7fc03878'

* commit '87bd298abeb901fe16383a0d267502cc7fc03878':
  DPX parser

Conflicts:
	libavcodec/dpx_parser.c
	libavcodec/version.h

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

2014-12-19 03:30:40 +01:00

compat

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

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

doc

doc/filters: fix typos and spelling errors

2014-12-16 10:32:00 -09:00

libavcodec

Merge commit '87bd298abeb901fe16383a0d267502cc7fc03878'

2014-12-19 03:30:40 +01:00

libavdevice

lavd/alsa-audio-common: mark default device in device list

2014-12-14 23:55:41 +01:00

libavfilter

avfilter/lut: reduce dereference in the inner loop

2014-12-18 21:54:23 +01:00

libavformat

Merge commit '59f0275dd0a42a7f90271a83a78e9ca5e69ff5b0'

2014-12-19 02:58:16 +01:00

libavresample

Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

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

libavutil

libavutil: cosmetic: inserted spaces wherever necessary

2014-12-17 02:18:02 +01:00

libpostproc

postproc: fix qp count

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

libswresample

swresample/soxr_resample: fix error handling

2014-12-13 21:12:56 +01:00

libswscale

swscale: increase yuv2rgb table headroom

2014-12-16 23:37:26 +01:00

presets

presets: remove moldering iPod presets

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

tests

Merge commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747'

2014-12-10 00:58:13 +01:00

tools

Merge commit '6f26f14f134e753d6168591f30815b1c08c1498b'

2014-11-24 14:01:50 +01:00

.gitattributes

Treat all '*.pnm' files as non-text file

2014-11-28 17:52:43 -05: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

Merge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a'

2014-12-19 02:49:36 +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: use macros for device test

2014-12-14 23:55:41 +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

configure: create the tests directory like the doc directory

2014-12-15 13:56:59 +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: fix accurate seeking with -copyts

2014-11-24 17:31:26 +01:00

ffmpeg_opt.c

ffmpeg: take bsf arguments from the command line

2014-11-30 13:11:34 +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

ffmpeg: Check for subtitle_out malloc failure

2014-12-15 23:26:54 +01:00

ffmpeg.h

ffmpeg: take bsf arguments from the command line

2014-11-30 13:11:34 +01:00

ffplay.c

ffplay: fix mem leak when opening input or parsing options fail.

2014-11-22 15:55:07 +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: 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: use avcodec_copy_context to copy context

2014-12-02 21:58:34 +01: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: mention that uspp is GPL

2014-12-12 01:52:20 +01:00

MAINTAINERS

avcodec: Add NVENC encoder

2014-12-11 01:06:27 +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: 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 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%