FFmpeg

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

Go to file

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

* qatar/master:
  proresdsp: fix function prototypes.
  prores-idct: fix overflow in c code.
  fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
  prores: add missing feature warning for alpha
  mov: 10l: Terminate string with 0 not '0'
  mov: Prevent illegal writes when chapter titles are very short.
  prores: add appropriate -fix_fmt parameter to FATE command
  riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
  lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
  lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER

Conflicts:
	libavcodec/avcodec.h
	libavformat/mov.c
	tests/fate/prores.mak
	tests/ref/acodec/g726
	tests/ref/fate/prores-alpha

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

2011-10-14 22:24:00 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2011-10-14 03:48:22 +02:00

ffpresets

remove libx264 lossless presets

2011-09-26 22:04:23 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2011-10-14 22:24:00 +02:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2011-10-13 06:00:03 +02:00

libavfilter

vsrc_nullsrc: remove mathematical constants now redundant.

2011-10-13 18:08:51 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2011-10-14 22:24:00 +02:00

libavutil

opt: handle AV_OPT_TYPE_CONST too

2011-10-14 02:18:55 +02:00

libpostproc

postproc: fix compilation failure, now really

2011-09-24 01:51:35 +02:00

libswresample

swresample: fix another broken indent chunk.

2011-10-10 15:55:28 +02:00

libswscale

Merge remote-tracking branch 'qatar/master'

2011-10-13 06:00:03 +02:00

mt-work

Update todo

2011-06-12 18:01:29 +02:00

tests

Merge remote-tracking branch 'qatar/master'

2011-10-14 22:24:00 +02:00

tools

Merge remote-tracking branch 'hexene/stagefright'

2011-10-13 18:04:02 +02:00

.gitignore

gitignore: add libswresample*

2011-09-19 17:39:38 +02:00

avconv.c

Merge remote-tracking branch 'qatar/master'

2011-10-13 06:00:03 +02:00

Changelog

Merge remote-tracking branch 'qatar/master'

2011-10-11 03:42:43 +02:00

cmdutils_common_opts.h

cmdutils: Fix loglevel for -debug

2011-10-14 02:18:55 +02:00

cmdutils.c

cmdutils: Fix loglevel for -debug

2011-10-14 02:18:55 +02:00

cmdutils.h

cmdutils.h: Project name cleanup

2011-10-14 02:18:55 +02:00

common.mak

Add libswresample.

2011-09-19 07:04:17 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2011-10-13 06:00:03 +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

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

doxygen: dont generate docs for avconv.c

2011-09-08 17:56:17 +02:00

ffmpeg.c

Merge remote-tracking branch 'qatar/master'

2011-10-13 06:00:03 +02:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2011-10-13 06:00:03 +02:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2011-10-13 06:00:03 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2011-10-13 06:00:03 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

LICENSE

libaac+ support

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

MAINTAINERS

Add libmodplug support.

2011-10-04 22:36:33 +02:00

Makefile

Add libswresample.

2011-09-19 07:04:17 +02:00

README

cosmetics: fix dashed line length after 070c5d0

2011-03-28 09:53:40 +02:00

RELEASE

RELEASE: 0.8.5 has been released

2011-10-03 23:32:22 +02:00

subdir.mak

Merge remote-tracking branch 'qatar/master'

2011-07-31 00:34:47 +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.

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%