FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer 2e0c360abd Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: Align muxer/demuxer declarations
  mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning
  avcodec: remove avcodec_guess_channel_layout()
  avutil: Add av_get_default_channel_layout()

Conflicts:
	doc/APIchanges
	libavcodec/mpeg12.c
	libavformat/cdg.c
	libavformat/matroskaenc.c
	libavformat/mpegts.c
	libavformat/nuv.c
	libavformat/wav.c
	libavutil/audioconvert.c
	libavutil/audioconvert.h
	libavutil/avutil.h

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

2012-04-06 22:52:01 +02:00

doc

doc: image2: update docs for glob input patterns

2012-04-06 15:18:31 +02:00

ffpresets

Merge remote-tracking branch 'qatar/master'

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

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-04-06 22:52:01 +02:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2012-04-04 21:17:52 +02:00

libavfilter

vsrc_buffer: remove overwrite support.

2012-04-06 11:01:22 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-04-06 22:52:01 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2012-04-06 22:52:01 +02:00

libpostproc

libpostproc: fix out of array accesses detected by AddressSanitizer.

2012-02-29 04:25:13 +01:00

libswresample

swr-test: remove unused variable

2012-04-01 22:24:06 +02:00

libswscale

Merge remote-tracking branch 'qatar/master'

2012-04-05 22:26:50 +02: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

tiny_psnr: allow searching for optimal shift value.

2012-04-06 20:13:50 +02:00

tools

Merge remote-tracking branch 'qatar/master'

2012-03-10 01:12:08 +01:00

.gitignore

Merge remote-tracking branch 'qatar/master'

2012-03-25 23:10:30 +02:00

Changelog

lavc: add a OpenEXR decoder

2012-04-06 08:32:09 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

2012-04-05 21:50:50 +02:00

cmdutils.c

Merge remote-tracking branch 'qatar/master'

2012-03-18 23:39:42 +01:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-03-18 23:39:42 +01:00

common.mak

Add coverage support.

2011-12-05 20:04:48 +01:00

configure

Merge remote-tracking branch 'qatar/master'

2012-04-05 22:26:50 +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

remove avconv from Doxyfile

2012-01-25 22:47:45 +01:00

ffmpeg.c

ffmpeg: remove unused MetadataMap.

2012-04-06 14:25:35 +02:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2012-03-29 04:11:10 +02:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2012-02-22 02:24:18 +01:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-03-29 04:11:10 +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-03-26 20:52:52 +02:00

LICENSE

Merge remote-tracking branch 'qatar/master'

2012-02-22 02:24:18 +01:00

MAINTAINERS

ZeroCodec Decoder

2012-03-19 00:19:13 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-03-26 20:52:52 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: bump to current version (0.10.2).

2012-03-26 22:47:28 +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%