mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 19:40:07 +01:00

Go to file

Michael Niedermayer 275cd55a0f Merge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4

* commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5':
  mp3dec: fix reading the Xing tag

Conflicts:
	libavformat/mp3dec.c

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

2015-01-18 01:10:56 +01:00

compat

Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'

2014-08-15 21:00:50 +02:00

doc

Update for 2.4.6

2015-01-13 17:14:46 +01:00

libavcodec

Merge commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4' into release/2.4

2015-01-18 00:05:18 +01:00

libavdevice

Merge commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2' into release/2.4

2015-01-18 00:50:34 +01:00

libavfilter

Merge commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782' into release/2.4

2015-01-18 01:03:19 +01:00

libavformat

Merge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4

2015-01-18 01:10:56 +01:00

libavresample

Merge commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409' into release/2.4

2015-01-18 00:49:47 +01:00

libavutil

Merge commit '61335ab33e594d47b84fde7367ee10dc66fc3465' into release/2.4

2015-01-17 22:43:37 +01:00

libpostproc

Add FFMPEG_VERSION into the binary libs

2014-12-20 02:26:27 +01:00

libswresample

Add FFMPEG_VERSION into the binary libs

2014-12-20 02:26:27 +01:00

libswscale

Merge commit '27487944eff721ef8e310db1a2a52329d9377f71' into release/2.4

2015-01-18 00:51:22 +01:00

presets

presets: remove moldering iPod presets

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

tests

Merge commit 'b31a3c6f2670d4def5aa8bd3479da9c771ab09e2' into release/2.4

2014-12-02 11:56:29 +01:00

tools

tools/crypto_bench: fix build when AV_READ_TIME is unavailable

2014-09-16 18:27:33 +02:00

.gitattributes

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

2014-12-01 08:02:37 -05:00

.gitignore

avcodec: export motion vectors in frame side data on demand

2014-08-18 14:13:57 +02:00

arch.mak

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

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

Changelog

Update for 2.4.6

2015-01-13 17:14:46 +01:00

cmdutils_common_opts.h

ffmpeg: add -devices param

2014-05-28 03:52:50 +02:00

cmdutils_opencl.c

cmdutils_opencl: Use av_malloc_array()

2014-07-01 03:49:36 +02:00

cmdutils.c

Merge commit '4d48691622149ba5998de08a0acec85d1f4ed46a' into release/2.4

2015-01-18 00:38:44 +01:00

cmdutils.h

ffmpeg: add -devices param

2014-05-28 03:52:50 +02:00

common.mak

Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'

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

configure

configure: bump year

2015-01-09 17:18:40 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_dxva2.c

Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643'

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

ffmpeg_filter.c

ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters

2014-09-11 04:55:58 +02:00

ffmpeg_opt.c

ffmpeg_opt: store canvas size in decoder context

2014-11-05 09:54:35 +01:00

ffmpeg_vda.c

Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

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

ffmpeg_vdpau.c

…

ffmpeg.c

ffmpeg: Clear error message array at init.

2015-01-09 17:18:41 +01:00

ffmpeg.h

ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter

2014-09-01 19:51:58 +02:00

ffplay.c

Revert the default for ffplay to -noautoexit.

2014-09-08 17:51:12 +02:00

ffprobe.c

Print bits_per_raw_sample for ffprobe -show_streams.

2014-09-08 17:49:20 +02:00

ffserver.c

ffserver: drop custom skip_spaces() impl

2014-09-13 21:01:01 -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

Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'

2014-08-29 01:08:57 +02:00

MAINTAINERS

MAINTAINERS: Add 2.4 to maintained releases, drop 2.3

2014-09-14 16:00:15 +02:00

Makefile

Makefile: add dependencies which require ffversion.h

2014-12-20 04:34:45 +01:00

README.md

Merge commit '96ce6d6f119a16e489941c629a2805204322b717'

2014-08-17 21:41:55 +02:00

RELEASE

Update for 2.4.6

2015-01-13 17:14:46 +01:00

RELEASE_NOTES

RELEASE_NOTES: add H.261 & HEVC RTP support

2014-09-16 11:34:50 +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

Conding examples are available in the doc/example 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%