ffmpeg

Go to file

Michael Niedermayer 9ba0719244 Merge commit 'f661006f235fa58bc756610cdc76c662ac0fab5f' into release/0.10

* commit 'f661006f235fa58bc756610cdc76c662ac0fab5f':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/avconv.texi

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

2015-03-11 21:54:41 +01:00

doc

doc: switch github urls to https

2014-06-03 01:03:53 +02:00

ffpresets

Merge remote-tracking branch 'qatar/master'

2011-10-20 02:34:51 +02:00

libavcodec

Merge commit '2deac60a387409dcbc7b37a8c30de89c7aeb58ac' into release/0.10

2015-03-11 21:50:03 +01:00

libavdevice

buildsystem: 10l add v4l entry back

2012-01-25 00:46:41 +01:00

libavfilter

Merge commit 'e4fdfdf65d520ce3af13a21ff8a3649e37757af8' into release/0.10

2014-08-09 19:12:46 +02:00

libavformat

Merge commit '90a2359fef5325f90aec0eca51b145d90ca3df7d' into release/0.10

2015-03-11 21:32:10 +01:00

libavutil

Merge commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f' into release/0.10

2014-06-29 03:08:22 +02:00

libpostproc

pp: avoid overflow in w*h

2012-10-25 21:19:56 +02:00

libswresample

libswresample: introduce int swr_set_compensation() instead of void swr_compensate()

2012-01-09 04:16:06 +01:00

libswscale

swscale: Remove two bogus asserts

2014-08-21 05:40:26 -07:00

mt-work

Update todo

2011-06-12 18:01:29 +02:00

presets

Remove redundant libx264 preset files

2011-10-22 01:32:10 +02:00

tests

Merge commit '2deac60a387409dcbc7b37a8c30de89c7aeb58ac' into release/0.10

2015-03-11 21:50:03 +01:00

tools

ffeval: avoid folding EOF onto a valid char

2012-10-25 21:19:56 +02:00

.gitignore

Ignore generated aviocat tool.

2013-01-03 15:20:12 +01:00

Changelog

Update Changelog for v0.8.14

2014-08-08 20:49:45 -04:00

cmdutils_common_opts.h

ff*: add -max_alloc command line option

2011-12-25 18:55:43 +01:00

cmdutils.c

Merge commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a' into release/0.10

2014-08-09 19:15:49 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-01-19 01:19:38 +01:00

common.mak

Merge commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf' into release/0.10

2013-01-17 01:58:54 +01:00

configure

Merge commit 'c98d164a6a2c3d93bfb10d44c946bc3ed56f14e7' into release/0.10

2014-08-12 20:01:22 +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

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

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

COPYING.LGPLv3

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

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

CREDITS

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

Doxyfile

Update for 0.10.15

2014-08-12 20:44:27 +02:00

ffmpeg.c

Merge commit '277103e07fbe22fc8e4361bacd5c6b48133f3ba5' into release/0.10

2014-08-09 19:13:54 +02:00

ffplay.c

Merge commit '0ab76ddf313eeab70d06619ae0376fd7dd40761b' into release/0.10

2014-08-12 19:53:37 +02:00

ffprobe.c

ffprobe: fix use of uninitialized pointer in av_strtok()

2012-10-25 21:09:14 +02:00

ffserver.c

ffserver: fix order of evaluation bugs

2013-07-29 04:57:11 +02:00

INSTALL

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

library.mak

Merge commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf' into release/0.10

2013-01-17 01:58:54 +01:00

LICENSE

libaac+ support

2011-09-26 02:28:21 +02:00

MAINTAINERS

maintainers: add myself for recent works.

2012-01-24 16:07:53 +01:00

Makefile

Merge commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf' into release/0.10

2013-01-17 01:58:54 +01:00

README

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

RELEASE

Update for 0.10.15

2014-08-12 20:44:27 +02:00

VERSION

Update for 0.10.15

2014-08-12 20:44:27 +02:00

version.sh

version.sh: handle shallow clones and snapshots.

2011-07-22 10:43:59 +02:00

README

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.

Languages

C 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%