FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00

Go to file

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

* qatar/master:
  Escape 130 (RPL) decoder

Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/codec_desc.c
	libavcodec/escape130.c
	libavcodec/version.h

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

2013-05-18 14:31:01 +02:00

compat

…

doc

doc/fate: update server host key fingerprints

2013-05-18 12:40:10 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2013-05-18 14:31:01 +02:00

libavdevice

Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

2013-05-16 09:56:43 +02:00

libavfilter

Merge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'

2013-05-18 13:41:47 +02:00

libavformat

Escape 130 (RPL) decoder

2013-05-18 07:12:56 +02:00

libavresample

Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'

2013-05-18 11:25:58 +02:00

libavutil

Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2'

2013-05-18 11:17:52 +02:00

libpostproc

…

libswresample

…

libswscale

sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input

2013-05-18 01:20:30 +02:00

presets

…

tests

sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input

2013-05-18 01:20:30 +02:00

tools

tools/ffhash: Use O_BINARY when available

2013-05-17 00:38:07 +02:00

.gitignore

Rename ffadler to ffhash and expand it using the generic hash API

2013-05-16 17:58:56 +02:00

arch.mak

…

Changelog

Merge remote-tracking branch 'qatar/master'

2013-05-18 14:31:01 +02:00

cmdutils_common_opts.h

…

cmdutils.c

Merge remote-tracking branch 'qatar/master'

2013-05-15 11:10:09 +02:00

cmdutils.h

…

common.mak

…

configure

Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'

2013-05-17 10:38:08 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

…

ffmpeg_opt.c

…

ffmpeg.c

…

ffmpeg.h

…

ffplay.c

…

ffprobe.c

…

ffserver.c

…

INSTALL

…

library.mak

…

LICENSE

lavfi: port wavelet denoiser filter from libmpcodecs.

2013-05-16 00:45:45 +02:00

MAINTAINERS

lavfi: factorize drawgrid and drawbox code

2013-05-17 00:46:32 +02:00

Makefile

…

README

…

RELEASE

…

version.sh

…

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.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%