ffmpeg

Go to file

Michael Niedermayer 2e0cc34292 Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'

* commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb':
  matroskaenc: cosmetics, reorder the #includes

Conflicts:
	libavformat/matroskaenc.c

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

2013-05-03 13:09:23 +02:00

compat

Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/.

2013-03-21 04:23:24 +01:00

doc

Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'

2013-05-03 12:15:01 +02:00

libavcodec

Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a'

2013-05-03 13:03:00 +02:00

libavdevice

avdevice/lavfi: add error checking for av_opt_set_int_list()

2013-04-12 20:39:07 +02:00

libavfilter

lavfi/blend: merge config_input_top into config_output

2013-05-02 12:22:18 +00:00

libavformat

Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'

2013-05-03 13:09:23 +02:00

libavresample

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

2013-03-28 11:20:41 +01:00

libavutil

Merge commit '566b7a20fd0cab44d344329538d314454a0bcc2f'

2013-05-03 11:57:59 +02:00

libpostproc

lavfi/pp: switch to an AVOptions-based system.

2013-04-10 23:16:03 +02:00

libswresample

swr/rematrix: use av_calloc()

2013-04-15 20:31:06 +02:00

libswscale

Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'

2013-05-01 18:21:35 +02:00

presets

…

tests

Merge commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44'

2013-05-03 11:41:48 +02:00

tools

ismindex: check mkdir()s return code

2013-04-21 19:53:18 +02:00

.gitignore

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

2013-04-06 13:23:38 +02:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'

2013-05-01 17:24:43 +02:00

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

2013-04-11 16:07:46 +02:00

cmdutils.c

lavfi: add timeline support.

2013-04-23 01:02:27 +02:00

cmdutils.h

Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'

2013-04-12 15:56:20 +02:00

common.mak

Integrate lcov/gcov into Libav

2013-04-05 18:55:11 +02:00

configure

Merge commit 'ffb068ce8e99df121d18a5b9b1d820f3ea8697fb'

2013-05-03 11:17:02 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'

2013-05-01 17:24:43 +02:00

ffmpeg_opt.c

Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'

2013-05-01 12:09:07 +02:00

ffmpeg.c

ffmpeg: fix segfault with random output

2013-05-02 16:01:28 +02:00

ffmpeg.h

Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'

2013-04-11 23:50:39 +02:00

ffplay.c

Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'

2013-04-28 12:03:41 +02:00

ffprobe.c

ffprobe: set writer context to 0 after allocation

2013-03-19 18:00:34 +01:00

ffserver.c

ffserver/ctime1: avoid using strcpy()

2013-03-25 23:31:34 +01:00

INSTALL

…

library.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

2013-03-28 12:12:38 +01:00

LICENSE

lavfi: add video stabilization plugins using vid.stab library

2013-04-24 18:30:42 +02:00

MAINTAINERS

MAINTAINERS: add jpeg2000 maintainer

2013-04-24 16:42:47 +02:00

Makefile

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

2013-04-06 13:23:38 +02:00

README

…

RELEASE

RELEASE: 1.1.git for master

2013-01-06 21:42:35 +01:00

version.sh

…

README

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.

Languages

C 90.4%

Assembly 7.7%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%