FFmpeg

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

Go to file

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

* qatar/master:
  FATE: add tests for targa
  ARM: fix Thumb-mode simple_idct_arm
  ARM: 4-byte align start of all asm functions
  rgb2rgb: rgb12to15()
  swscale-test: fix stack overread.
  swscale: fix invalid conversions and memory problems.
  cabac: split cabac.h into declarations and function definitions
  cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.
  cabac: Remove ff_h264_lps_state array.

Conflicts:
	libswscale/rgb2rgb.h
	libswscale/swscale_unscaled.c
	tests/fate/image.mak

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

2012-01-14 02:22:09 +01:00

doc

Merge remote-tracking branch 'qatar/master'

2012-01-13 01:29:48 +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-01-14 02:22:09 +01:00

libavdevice

Revert "v4l2: poll the file descriptor"

2012-01-11 14:57:56 +01:00

libavfilter

vf_deshake: remove unused variable totalangles

2012-01-13 17:00:21 +01:00

libavformat

ico: favour BITMAPHEADER dimensions over IconEntry dimensions

2012-01-13 15:57:34 +01:00

libavutil

Fix step_minus1 pixel descirption for RGB64.

2012-01-11 10:54:12 +01:00

libpostproc

Merge remote-tracking branch 'qatar/master'

2012-01-05 02:03:12 +01:00

libswresample

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

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

libswscale

Merge remote-tracking branch 'qatar/master'

2012-01-14 02:22:09 +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-01-14 02:22:09 +01:00

tools

Merge remote-tracking branch 'qatar/master'

2012-01-12 01:10:32 +01:00

.gitignore

doc: fate: Support building a plain text version

2011-12-20 16:05:01 +01:00

avconv.c

Merge remote-tracking branch 'qatar/master'

2012-01-13 01:29:48 +01:00

Changelog

Merge remote-tracking branch 'qatar/master'

2012-01-12 01:10:32 +01:00

cmdutils_common_opts.h

ff*: add -max_alloc command line option

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

cmdutils.c

Merge remote-tracking branch 'qatar/master'

2012-01-12 01:10:32 +01:00

cmdutils.h

cmdutils: make this_year extern, so it can be referenced from other .o files

2012-01-07 11:02:13 +01:00

common.mak

Add coverage support.

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

configure

configure: provide libavfilter/version.h header to get_version()

2012-01-13 16:28:27 +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

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

Fix a bunch of platform name and other typos.

2012-01-11 13:48:30 +01:00

ffmpeg.c

Increase maximum encoding video buffer size.

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

ffplay.c

ffplay: Exit on ctrl-c.

2012-01-09 23:22:56 +01:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2012-01-13 01:29:48 +01:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-01-13 01:29:48 +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

libaac+ support

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

MAINTAINERS

MAINTAINERS: update release maintainers

2012-01-02 16:01:33 +01:00

Makefile

Makefile: fix path to ffprobe.xsd

2011-12-27 22:29:40 +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-12 01:10:32 +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.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%