FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

Go to file

Michael Niedermayer 15ef1cfe64 Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'

* commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609':
  avplay: use audio parameters from the decoded frame instead of AVCodecContext
  dca: allocate a secondary buffer for extra channels when downmixing
  configure: use utilities from /usr/xpg4/bin if it exists
  avstring-test: fix memory leaks

Conflicts:
	ffplay.c
	libavcodec/dcadec.c

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

2012-10-13 16:39:42 +02:00

compat

MinGW: Use our snprintf/vsnprintf when MinGW's is broken

2012-09-25 18:14:14 -04:00

doc

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

libavcodec

Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'

2012-10-13 16:39:42 +02:00

libavdevice

caca: fix 10l typo

2012-10-12 19:05:58 +02:00

libavfilter

Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'

2012-10-13 14:14:11 +02:00

libavformat

smjpegdec: use url_feof()

2012-10-13 14:15:58 +00:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

libavutil

Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'

2012-10-13 16:39:42 +02:00

libpostproc

postproc: Create version.h header

2012-09-28 15:06:26 +02:00

libswresample

swri_resample_init: unsupported sample formats are an internal error.

2012-10-11 04:36:23 +02:00

libswscale

sws: do not use av_pix_fmt_descriptors directly

2012-10-12 16:57:04 +00:00

presets

presets: specify the codecs.

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

tests

Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'

2012-10-13 15:42:49 +02:00

tools

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

.gitignore

gitignore: codec_names.h is no more

2012-09-07 14:59:01 +02:00

arch.mak

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

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

Changelog

prepare 9_beta1 release

2012-10-11 18:36:40 +02:00

cmdutils_common_opts.h

cmdutils: add -layouts option.

2012-08-28 15:09:49 +02:00

cmdutils.c

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

cmdutils.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-09-16 14:55:00 +02:00

configure

Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'

2012-10-13 16:39:42 +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

Revert "partially rename FFmpeg to Libav"

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

Doxyfile

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

ffmpeg_filter.c

Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'

2012-10-13 15:01:39 +02:00

ffmpeg_opt.c

Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'

2012-10-13 15:01:39 +02:00

ffmpeg.c

Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'

2012-10-13 15:01:39 +02:00

ffmpeg.h

Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'

2012-10-13 15:01:39 +02:00

ffplay.c

Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'

2012-10-13 15:01:39 +02:00

ffprobe.c

ffprobe: fix use of uninitialized pointer in av_strtok()

2012-10-11 03:37:43 +02:00

ffserver.c

ffserver: fix return value of add_codec()

2012-10-13 05:36:41 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-10-11 15:55:41 +02:00

LICENSE

LICENSE: correct incorrect claims on *GPL incompatibility

2012-08-16 04:47:18 +02:00

MAINTAINERS

add dshow maintainer

2012-10-12 19:52:05 +02:00

Makefile

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

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

README

README: be a tiny bit more verbose

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

RELEASE

prepare 9_beta1 release

2012-10-11 18:36:40 +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 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%