FFmpeg

mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-24 06:12:42 +00:00

Go to file

Michael Niedermayer 2581d9bcbb Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: add apidoc target for doxygen API documentation
  matroskadec: do not use avpacket internals

Conflicts:
	doc/Makefile
	libavformat/matroskadec.c

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

2012-11-03 14:48:51 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2012-11-03 14:48:51 +01:00

libavcodec

Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'

2012-11-03 14:24:11 +01:00

libavdevice

dv1394: Swap the min and max values of the 'standard' option

2012-11-02 11:25:48 +02:00

libavfilter

Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'

2012-11-03 14:24:11 +01:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-11-03 14:48:51 +01:00

libavresample

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

libavutil

Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'

2012-11-03 14:24:11 +01:00

libpostproc

pp: avoid overflow in w*h

2012-10-13 21:17:43 +02:00

libswresample

lswr/swresample.h: use consistent inclusion guard header name

2012-11-03 12:06:43 +01:00

libswscale

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

presets

presets: specify the codecs.

2012-05-04 18:40:36 +02:00

tests

lclenc: make compression level user selectable

2012-11-02 22:14:14 +00:00

tools

probetest: fix possible use of uninitialized data

2012-10-31 13:16:52 +01:00

.gitignore

tools: add ffescape utility

2012-10-25 23:56:16 +02:00

arch.mak

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

2012-10-13 15:25:11 +02:00

Changelog

lavfi: add field filter

2012-10-31 12:07:11 +01:00

cmdutils_common_opts.h

cmdutils: allow specifying the file for -report

2012-11-01 02:59:44 +01:00

cmdutils.c

cmdutils: allow specifying the file for -report

2012-11-01 02:59:44 +01:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-11-01 13:25:46 +01:00

common.mak

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

configure

Apply again [916352f282855e3e4e86a39df9452fead2aa0771] that got lost in the merges.

2012-11-02 00:28:25 +01:00

COPYING.GPLv2

…

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

Revert "partially rename FFmpeg to Libav"

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

ffmpeg_filter.c

ffmpeg: fix negative array index

2012-10-22 13:58:19 +02:00

ffmpeg_opt.c

ffmpeg: complain loudly and exit in case removed -sameq option is specified

2012-11-03 12:05:43 +01:00

ffmpeg.c

Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'

2012-11-03 14:24:11 +01:00

ffmpeg.h

ffmpeg: use av_rescale_delta() on the audio filter input

2012-10-27 00:26:35 +02:00

ffplay.c

ffplay: remove redundant !codec check

2012-11-01 15:46:18 +01:00

ffprobe.c

ffprobe: add an array of section print buffers to the WriterContext

2012-10-24 23:40:21 +02:00

ffserver.c

Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'

2012-10-28 13:19:11 +01:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-11-03 14:48:51 +01:00

LICENSE

lavfi/hue: add missing GPL dependency.

2012-10-31 19:28:02 +01:00

MAINTAINERS

Change my GPG fingerprint

2012-10-30 18:51:21 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-10-26 15:20:48 +02:00

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'

2012-10-24 14:01:36 +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 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 91.6%

Assembly 6.5%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%