mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00

Go to file

Michael Niedermayer b023230170 Merge commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d'

* commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d':
  utvideodec: Handle slice_height being zero

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

2015-03-09 02:04:13 +01:00

compat

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

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

doc

Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'

2015-03-08 23:58:18 +01:00

libavcodec

avcodec/tiff: move bpp check to after "end:"

2015-03-08 23:36:46 +01:00

libavdevice

Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'

2015-03-08 19:44:09 +01:00

libavfilter

avfilter/vf_edgedetect: Change enums to int, which are accessed via AVOption as int

2015-03-08 21:10:31 +01:00

libavformat

Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'

2015-03-08 19:59:30 +01:00

libavresample

Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08'

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

libavutil

Merge commit 'dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73'

2015-03-07 19:30:51 +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 '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'

2015-03-08 23:58:18 +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

configure, mips: remove MIPS32R2, merging it with MIPSFPU

2015-03-06 14:01:31 +01:00

Changelog

ChangeLog: Remove the redundant VP9 RTP entry

2015-03-07 20:14:39 +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

Merge commit 'b77e335e441040a40fc6156b8e4a134745d10233'

2015-03-07 19:41:00 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

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

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

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%