Go to file

Michael Niedermayer 3a4c22f806 Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'

* commit '6d96c7ea89600655b1f18a3b12f3f041fa714152':
  vf_showinfo: Forward the av_image_get_linesize error

Conflicts:
	libavfilter/vf_showinfo.c

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

2014-10-18 21:50:34 +02:00

compat

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

2014-10-09 17:51:46 -03:00

doc

ffplay: update documentation

2014-10-18 00:48:49 +02:00

libavcodec

avcodec/wmv2enc: add priv_class

2014-10-18 20:06:29 +02:00

libavdevice

Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303'

2014-10-05 03:42:55 +02:00

libavfilter

Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'

2014-10-18 21:50:34 +02:00

libavformat

Merge commit 'fb238f8230c1b0314985482207add548c68f83cf'

2014-10-18 12:16:04 +02:00

libavresample

Add missing "const" all over the place.

2014-08-29 18:57:25 +02:00

libavutil

libavutil: Add missing av_free() to cast5 selftest

2014-10-18 16:57:54 +02:00

libpostproc

postproc: fix qp count

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

libswresample

swresample/resample: fix invert_initial_buffer() after flush

2014-10-16 22:35:27 +02:00

libswscale

swscale: support internal scaler cascades

2014-10-11 05:05:17 +02:00

presets

presets: remove moldering iPod presets

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

tests

tests/fate/mpeg4: add -sws_flags +bitexact

2014-10-18 12:44:32 +02:00

tools

Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'

2014-10-16 12:45:01 +02: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

libavutil: Add CAST128 symmetric block cipher

2014-10-18 01:33:45 +02: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 '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'

2014-10-17 14:57:40 +02: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: add pkg-config support for libx264

2014-10-18 02:36:25 +02: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

Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'

2014-10-17 13:47:49 +02:00

ffmpeg_opt.c

ffmpeg_opt: abort if -to <= -ss

2014-10-11 22:20:39 +02: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

Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'

2014-10-18 15:04:42 +02:00

ffmpeg.h

ffmpeg: add vdpau_old to allow continued testing of the older (but not oldest) API

2014-10-06 16:09:02 +02:00

ffplay.c

ffplay: remove manual bug option handling code

2014-10-17 23:44:04 +02:00

ffprobe.c

ffprobe: Simplify by using av_color_range_name()

2014-10-10 04:24:55 +02:00

ffserver.c

ffserver: use av_freep(), do not leave stale pointers in memory

2014-10-08 15:22:24 +02: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

Add missing entry for maintainer of rtpenc_hevc.*

2014-09-22 15:01:04 +02:00

Makefile

Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'

2014-07-22 03:06:43 +02:00

README.md

Merge commit '96ce6d6f119a16e489941c629a2805204322b717'

2014-08-17 21:41:55 +02: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

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

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%