FFmpeg

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

Go to file

Michael Niedermayer 102a1d9239 Merge commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2'

* commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2':
  ffv1: Make sure at least one slice context is initialized

Conflicts:
	libavcodec/ffv1.c

This condition is not possible in ffmpegs ffv1 code and already
checked for by assert() for the case that some future changes make it possible.
Thus merge just for meta-data

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

2013-09-17 17:03:22 +02:00

compat

Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'

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

doc

doc/fftools-common-opts: document -help long and full output

2013-09-17 12:30:40 +02:00

libavcodec

Merge commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9'

2013-09-17 16:47:18 +02:00

libavdevice

lavd/v4l2: Improve debug message

2013-09-08 14:30:52 +02:00

libavfilter

avfilter: add adelay filter

2013-09-16 14:33:07 +00:00

libavformat

Merge commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52'

2013-09-17 16:04:41 +02:00

libavresample

Reinstate proper FFmpeg license for all files.

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

libavutil

Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7'

2013-09-17 11:06:26 +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/yuv2rgb: make sure yuvTable is set to NULL after deallocation

2013-09-16 22:47:21 +02:00

presets

presets: specify the codecs.

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

tests

matroskaenc: Bump DocTypeVersion to 4

2013-09-15 02:08:15 +02:00

tools

tools/crypto_bench: fix 2 typos.

2013-09-04 21:59:34 +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 adelay filter

2013-09-16 14:33:07 +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 '187105ff8a02bafc9c58d9d8363bb3f55a415635'

2013-09-17 10:53:14 +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: downgrade log level for non fatal errors in open_input_file()

2013-09-17 15:59:48 +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

lavfi/hue: relicense to LGPL with permission by all contributors

2013-09-03 17:21:06 +00:00

MAINTAINERS

MAINTAINERS: move sections from lavc to lavu

2013-09-12 15:17:11 +02:00

Makefile

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

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

README

README: be a tiny bit more verbose

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

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%