mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-06 21:04:45 +03:00

Go to file

Michael Niedermayer 3ed80bd95e Merge commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c'

* commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c':
  xsub: Support DXSA subtitles

Conflicts:
	libavcodec/xsubdec.c

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

2015-01-08 00:09:13 +01:00

compat

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

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

doc

avfilter/vf_idet: Add analyze_interlaced_flag mode

2015-01-06 01:21:19 +01:00

libavcodec

Merge commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c'

2015-01-08 00:09:13 +01:00

libavdevice

lavd/lavfi: allow to extract subcc.

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

libavfilter

Merge commit '4438c256387a5845e5cdc5c14c43f4047b68301b'

2015-01-07 00:03:10 +01:00

libavformat

Merge commit '01168bf1405ddbf671f1074a927b951b8777adbb'

2015-01-07 22:48:24 +01:00

libavresample

Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

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

libavutil

Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'

2015-01-06 21:37:48 +01:00

libpostproc

Add FFMPEG_VERSION into the binary libs

2014-12-19 19:32:40 +01:00

libswresample

x86/swr: disable pack_8ch functions on msvc/icl x86_32

2014-12-31 16:38:33 -03:00

libswscale

Merge commit '1dd797e3c9f179f957316a0becbec048b42df8aa'

2015-01-06 21:44:50 +01:00

presets

presets: remove moldering iPod presets

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

tests

tests/regression-funcs: Remove hardcoded threads 1

2015-01-03 15:09:12 +01:00

tools

tools/ismindex.c: Use av_realloc_array()

2015-01-06 21:08:33 +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 '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4'

2015-01-07 00:48:23 +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.c: Use av_realloc_array()

2015-01-06 17:52:54 +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

Merge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4'

2015-01-07 00:48:23 +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: fix accurate seeking with -copyts

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

ffmpeg_opt.c

ffmpeg_opt: Check for av_realloc_array() failure

2015-01-07 18:22:37 +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: Use av_freep(), avoid leaving stale pointers in memory

2014-12-28 02:56:02 +01:00

ffmpeg.h

ffmpeg: add sdp_file option

2014-12-28 02:05:34 +01:00

ffplay.c

ffplay: dump format before selecting streams

2015-01-01 14:38:12 +01:00

ffprobe.c

ffprobe: Support extracting the number of reference frames

2014-12-30 17:55:20 +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: reindent rtsp_cmd_setup()

2015-01-03 20:22:45 -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

lavfi: port mp=fspp to a native libavfilter filter

2014-12-24 16:29:18 +01:00

MAINTAINERS

avcodec: Add NVENC encoder

2014-12-11 01:06:27 +01:00

Makefile

Makefile: add dependencies which require ffversion.h

2014-12-20 04:17:03 +01: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.

Description

FFmpeg - это набор библиотек и инструментов для обработки мультимедийного контента, такого как аудио, видео, субтитры и связанные с ними метаданные

https://ffmpeg.org/

audio converter video

Readme 445 MiB

Languages

C 88.6%

Assembly 8.3%

Makefile 1.6%

GLSL 0.4%

C++ 0.3%

Other 0.6%