T

Michael Niedermayer 511398031c Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'

* commit '424b929b5cb9ca4094099f25179829260d4b0fa3':
  pulse: Add a wallclock option to be compatible with other other captures

Conflicts:
	libavdevice/pulse_audio_dec.c

wallclock mode was supported and default in FFmpeg already before this commit.
its thus left the default

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

2014-08-24 21:33:59 +02:00

compat

Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'

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

doc

avfilter: add codecview filter

2014-08-24 14:35:11 +02:00

libavcodec

lavc/h264_slice: Add a missing newline to an error message.

2014-08-24 15:33:10 +02:00

libavdevice

Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'

2014-08-24 21:33:59 +02:00

libavfilter

avfilter: add codecview filter

2014-08-24 14:35:11 +02:00

libavformat

avformat/matroskaenc: Check alpha_mode

2014-08-24 20:33:17 +02:00

libavresample

Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'

2014-08-17 21:43:06 +02:00

libavutil

avutil/pixelutils: faster pixelutils_sad_16x16

2014-08-23 20:12:56 +02:00

libpostproc

Drop remaining unneeded != NULL

2014-08-15 22:47:45 +02:00

libswresample

swresample: Add AVFrame based API

2014-08-16 20:39:37 +02:00

libswscale

lsws: duplicate ff_log2_tab

2014-08-12 20:52:21 +02:00

presets

presets: remove moldering iPod presets

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

tests

avfilter: add codecview filter

2014-08-24 14:35:11 +02:00

tools

Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'

2014-08-22 21:55:27 +02: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

avfilter: add codecview filter

2014-08-24 14:35:11 +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

Drop remaining unneeded != NULL

2014-08-15 22:47:45 +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

lavc/tiff: add support for LZMA compression

2014-08-24 01:21:39 +02: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_filter: refuse to configure input without a decoder.

2014-07-30 14:40:45 +02:00

ffmpeg_opt.c

Use new av_dict_set_int helper function.

2014-08-16 14:31:41 +02:00

ffmpeg_vda.c

Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

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

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

ffmpeg.c

Drop remaining unneeded != NULL

2014-08-15 22:47:45 +02:00

ffmpeg.h

ffmpeg: remove 32 channel limit from audio_channels_map

2014-08-15 05:38:47 +02:00

ffplay.c

Use new av_dict_set_int helper function.

2014-08-16 14:31:41 +02:00

ffprobe.c

ffprobe: add -show_data_hash option.

2014-08-17 11:30:55 +02:00

ffserver.c

ffserver: warn if config uses a system port

2014-08-17 22:51:45 -04: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

lavc/flacenc: add sse4 version of the 16-bit lpc encoder

2014-08-13 01:14:47 +02:00

MAINTAINERS

Add support for H.261 RTP payload format (RFC 4587)

2014-08-24 03:53:30 +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

Prepare for 11_beta2 Release

2014-08-23 10:12:16 -04:00

RELEASE_NOTES

avfilter: add codecview filter

2014-08-24 14:35:11 +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.