FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00

Go to file

Michael Niedermayer f58f75dd92 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rv34: error out on size changes with frame threading
  aacsbr: Add a debug check to sbr_mapping.
  aac: Reset some state variables when turning SBR off
  aac: Reset PS parameters on header decode failure.
  fate: add wmalossless test.
  aacsbr: handle m_max values smaller than 4.

Conflicts:
	libavcodec/aacsbr.c
	tests/fate/lossless-audio.mak

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

2012-03-24 10:59:43 +01:00

doc

doc/examples/decoding_encoding: make the buffer bigger.

2012-03-22 05:25:26 +01:00

ffpresets

Merge remote-tracking branch 'qatar/master'

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

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-03-24 10:59:43 +01:00

libavdevice

x11grab: fix compilation

2012-03-18 01:12:03 +01:00

libavfilter

bbox: remove superfluous initializations

2012-03-22 13:40:37 +01:00

libavformat

xmv: check channel number

2012-03-23 10:31:45 +01:00

libavutil

pixdesc: put components always in the same order.

2012-03-21 19:01:39 +01:00

libpostproc

libpostproc: fix out of array accesses detected by AddressSanitizer.

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

libswresample

swr: check that there is enough information to do rematrixing when needed.

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

libswscale

swscale: Merge a hunk from qatar that seems to have been forgotten or lost.

2012-03-21 15:30:52 +01: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 remote-tracking branch 'qatar/master'

2012-03-24 10:59:43 +01:00

tools

Merge remote-tracking branch 'qatar/master'

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

.gitignore

Merge remote-tracking branch 'qatar/master'

2012-01-26 02:23:56 +01:00

Changelog

lavfi: add tile video filter.

2012-03-21 15:52:45 +01:00

cmdutils_common_opts.h

Merge remote-tracking branch 'qatar/master'

2012-03-07 03:22:49 +01: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-03-23 21:20:06 +01: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

Merge remote-tracking branch 'qatar/master'

2012-03-23 21:20:06 +01:00

ffplay.c

ffplay: use frame count based queueing for audio queue

2012-03-19 22:54:40 +01:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

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

ffserver.c

ffserver: add missing buffer set after rewrite av_open_input_file to avformat_open_input.

2012-03-12 03:31:59 +01:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2011-12-18 03:04:44 +01: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-21 01:33:53 +01:00

README

Revert "partially rename FFmpeg to Libav"

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

RELEASE

Merge remote-tracking branch 'qatar/master'

2012-01-21 23:11:27 +01: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 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%

Other 0.1%