FFmpeg

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

Go to file

Michael Niedermayer 9b3d4258d9 Merge commit '2725f2d40315b56f17c5dffe39dda7d94786302d'

* commit '2725f2d40315b56f17c5dffe39dda7d94786302d':
  doc/filters: fix an option name in the unsharp docs

Conflicts:
	doc/filters.texi

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

2013-09-25 10:53:32 +02:00

compat

Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'

2013-08-28 12:46:12 +02:00

doc

doc/outdevs: add sdl window_fullscreen option

2013-09-23 23:37:14 +02:00

libavcodec

Merge commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5'

2013-09-25 10:25:17 +02:00

libavdevice

avdevice/v4l: remove duplicate include

2013-09-21 15:36:33 +02:00

libavfilter

lavfi/dualinput: reimplement on top of framesync.

2013-09-23 09:50:09 +02:00

libavformat

Merge commit '668643b9239c70b777aea322eab411ebc960d9a0'

2013-09-25 09:39:24 +02:00

libavresample

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

libavutil

pixdesc: fix NV20* descriptors

2013-09-24 14:02:10 +02:00

libpostproc

postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"

2013-06-16 18:21:39 +02:00

libswresample

swresample: replace 2 av_free() by av_freep()

2013-09-16 22:44:15 +02:00

libswscale

swscale/swscale_unscaled: fix alpha values for rgb/bgr -> RGB32_1 / BGR32_1

2013-09-19 23:15:51 +02:00

presets

presets: specify the codecs.

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

tests

avcodec/mjpegenc: dont store DQT for LJPEG

2013-09-24 01:21:03 +02:00

tools

ffhash: Change size to an int

2013-09-24 16:29:18 +02:00

.gitignore

tools: add benchmark for crypto functions.

2013-09-04 16:36:11 +02:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

avfilter: add ladspa wrapper filter

2013-09-22 16:36:10 +00:00

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

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

cmdutils.c

cmdutils: silence warning about incompatible pointer types

2013-08-30 12:41:36 +00:00

cmdutils.h

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

2013-07-08 04:34:11 +02:00

common.mak

Integrate lcov/gcov into Libav

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

configure

Merge commit 'd6d27f3e58e6980bce4a490e7d8cc0f6a84521fe'

2013-09-24 14:35:52 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

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

ffmpeg_filter.c

ffmpeg_filter: check that the input media type match the filter

2013-08-14 03:03:41 +02:00

ffmpeg_opt.c

Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'

2013-08-06 12:41:04 +02:00

ffmpeg.c

ffmpeg: check for unsupported "queing of command on first filter supporting the specific commend"

2013-09-10 14:13:44 +02:00

ffmpeg.h

Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'

2013-08-06 12:41:04 +02:00

ffplay.c

ffplay: make next_nb_channels[] static const

2013-08-24 19:53:11 +02:00

ffprobe.c

ffprobe: fix uninitialized variable warning

2013-09-23 14:16:34 +02:00

ffserver.c

ffserver: allow choosing the pixel format

2013-09-14 03:51:45 +02:00

INSTALL

…

library.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

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

LICENSE

avfilter: port pullup filter from libmpcodecs

2013-09-17 17:03:36 +00:00

MAINTAINERS

lavf/libssh: add MAINTAINERS entry

2013-09-21 16:35:41 +02:00

Makefile

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

2013-05-24 13:01:41 +02:00

README

…

RELEASE

Update for 2.0

2013-07-10 02:15:43 +02: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%