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

Go to file

Michael Niedermayer 15ed7ca437 Merge commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6'

* commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6':
  xwma: Do not leak on failure path

Conflicts:
	libavformat/xwma.c

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

2014-11-21 21:30:47 +01:00

compat

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

2014-10-10 11:27:30 +03:00

doc

lavu/dict: add av_dict_get_string

2014-11-21 01:25:54 +01:00

libavcodec

avcodec/libspeexdec: more verbose error message

2014-11-21 20:08:56 +01:00

libavdevice

avdevice/avdevice.c: Use av_freep(), avoid leaving stale pointers

2014-11-21 18:03:11 +01:00

libavfilter

avfilter/af_volume: Use avpriv_float_dsp_alloc()

2014-11-18 12:38:38 +01:00

libavformat

Merge commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6'

2014-11-21 21:30:47 +01:00

libavresample

Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

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

libavutil

lavu/dict: add av_dict_get_string

2014-11-21 01:25:54 +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/x86/rgb2rgb_template: handle the first 2 lines with C in rgb24toyv12_*()

2014-11-20 01:20:31 +01:00

presets

presets: remove moldering iPod presets

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

tests

avformat: replace some odd 30-60 rates by higher less odd ones in get_std_framerate()

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

tools

Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c'

2014-11-17 23:09:22 +01: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: add zygoaudio

2014-11-21 20:21:56 +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: Exit in case of faulty stream specifiers

2014-11-17 04:06:32 +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

avcodec/pngdec: add APNG support.

2014-11-21 17:13:56 +01:00

COPYING.GPLv2

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00:00

COPYING.GPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

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

ffmpeg_opt: use codec private context in ffserver streams

2014-11-16 01:13:38 +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: skip duration cliping for passthrough & drop modes

2014-11-19 20:18:03 +01:00

ffmpeg.h

ffmpeg: better CFR frame duplication selection

2014-11-19 05:14:32 +01: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: fix possible crash

2014-11-17 00:27:25 +01:00

ffserver_config.h

ffserver_config: do not store preset name

2014-11-17 00:27:25 +01:00

ffserver.c

ffserver: drop pointless explicit !=0 checks

2014-11-16 20:25:55 -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 : change xBR filter to LGPL

2014-11-15 18:54:54 +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 89.9%

Assembly 8.1%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%