FFmpeg

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

Go to file

Michael Niedermayer fdccb84e3b Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'

* commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f':
  sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes
  avs: Increase magic value score above file extension score

Conflicts:
	libavformat/avs.c

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

2013-05-05 12:41:36 +02:00

compat

Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/.

2013-03-21 04:23:24 +01:00

doc

Merge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a'

2013-05-05 10:47:19 +02:00

libavcodec

Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'

2013-05-05 11:34:29 +02:00

libavdevice

Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'

2013-05-04 10:17:52 +02:00

libavfilter

Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

2013-05-05 11:42:18 +02:00

libavformat

Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'

2013-05-05 12:41:36 +02:00

libavresample

Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'

2013-05-05 11:50:37 +02:00

libavutil

lavu: add planar 16 bit and 8 bit rgb with alpha

2013-05-03 16:58:22 +00:00

libpostproc

lavfi/pp: switch to an AVOptions-based system.

2013-04-10 23:16:03 +02:00

libswresample

swr/rematrix: use av_calloc()

2013-04-15 20:31:06 +02:00

libswscale

Avoid incorrect deprecated pixel format warning.

2013-05-05 10:01:22 +02:00

presets

presets: specify the codecs.

2012-05-04 18:40:36 +02:00

tests

Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'

2013-05-05 10:36:23 +02:00

tools

Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'

2013-05-04 10:17:52 +02:00

.gitignore

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

2013-04-06 13:23:38 +02:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

extractplanes filter

2013-05-03 16:30:39 +00:00

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

2013-04-11 16:07:46 +02:00

cmdutils.c

lavfi: add timeline support.

2013-04-23 01:02:27 +02:00

cmdutils.h

Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'

2013-04-12 15:56:20 +02:00

common.mak

Integrate lcov/gcov into Libav

2013-04-05 18:55:11 +02:00

configure

configure: fix valgrind-memcheck arguments

2013-05-05 10:52:39 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'

2013-05-01 17:24:43 +02:00

ffmpeg_opt.c

Merge remote-tracking branch 'qatar/master'

2013-05-03 14:52:03 +02:00

ffmpeg.c

ffmpeg: drop old non monotone dts workaround.

2013-05-03 15:04:47 +02:00

ffmpeg.h

Merge remote-tracking branch 'qatar/master'

2013-05-03 14:52:03 +02:00

ffplay.c

Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'

2013-04-28 12:03:41 +02:00

ffprobe.c

ffprobe: set writer context to 0 after allocation

2013-03-19 18:00:34 +01:00

ffserver.c

ffserver/ctime1: avoid using strcpy()

2013-03-25 23:31:34 +01:00

INSTALL

…

library.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

2013-03-28 12:12:38 +01:00

LICENSE

lavfi: add video stabilization plugins using vid.stab library

2013-04-24 18:30:42 +02:00

MAINTAINERS

MAINTAINERS: add jpeg2000 maintainer

2013-04-24 16:42:47 +02:00

Makefile

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

2013-04-06 13:23:38 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: 1.1.git for master

2013-01-06 21:42:35 +01:00

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

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%