FFmpeg

Go to file

Mina Nagy Zaki 0dfcbe5285 lavfi: avfilter_merge_formats: handle case where inputs are same

This fixes a double-free crash if lists are the same due to the two
merge_ref() calls at the end of the (useless) merging that happens.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 11b6a82412)

Conflicts:

	libavfilter/formats.c

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit e5f4e24942)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit b6c5848a1f)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit a4e277312c)

Signed-off-by: Anton Khirnov <anton@khirnov.net>

2012-10-06 10:35:38 +02:00

doc

consolidate .gitignore patters into a single file

2011-02-10 14:02:23 +01:00

ffpresets

consolidate .gitignore patters into a single file

2011-02-10 14:02:23 +01:00

libavcodec

mpegvideo: Don't use ff_mspel_motion() for vc1

2012-10-06 10:35:19 +02:00

libavdevice

vfwcap: Include windows.h before vfw.h since the latter requires defines from the former. Patch by kemuri <kemuri9 at gmail dot com>

2012-06-02 19:25:58 -04:00

libavfilter

lavfi: avfilter_merge_formats: handle case where inputs are same

2012-10-06 10:35:38 +02:00

libavformat

ea: check chunk_size for validity.

2012-06-03 19:35:13 +02:00

libavutil

Make DECLARE_ALIGNED macros work with external array specifiers

2011-11-05 11:29:12 +01:00

libpostproc

consolidate .gitignore patters into a single file

2011-02-10 14:02:23 +01:00

libswscale

Fix MMX rgb24 to yuv conversion with gcc 4.6

2011-11-05 09:04:11 +01:00

tests

consolidate .gitignore patters into a single file

2011-02-10 14:02:23 +01:00

tools

consolidate .gitignore patters into a single file

2011-02-10 14:02:23 +01:00

vhook

Check the return values of a few functions to avoid the corresponding warnings.

2009-02-21 21:09:38 +00:00

.gitignore

also ignore *.so for vhook plugins

2011-02-10 14:09:35 +01:00

Changelog

Update changelog for 0.5.9 release

2012-06-08 15:41:31 -04:00

cmdutils.c

Merge (L)GPL upgrade code and related changes from trunk.

2009-06-07 12:52:31 +00:00

cmdutils.h

Fix typo: explixitly -> explicitly.

2009-02-19 00:14:41 +00:00

common.mak

backport symbol versioning patch

2010-02-01 16:00:09 +00:00

configure

mingw32: merge checks for mingw-w64 and mingw32-runtime >= 3.15 into one

2012-06-02 19:25:58 -04:00

COPYING.GPLv2

Merge (L)GPL upgrade code and related changes from trunk.

2009-06-07 12:52:31 +00:00

COPYING.GPLv3

Merge (L)GPL upgrade code and related changes from trunk.

2009-06-07 12:52:31 +00:00

COPYING.LGPLv2.1

Merge (L)GPL upgrade code and related changes from trunk.

2009-06-07 12:52:31 +00:00

COPYING.LGPLv3

Merge (L)GPL upgrade code and related changes from trunk.

2009-06-07 12:52:31 +00:00

CREDITS

it seems I never added myself in there before

2009-02-02 22:45:01 +00:00

Doxyfile

HAVE_3DNOW --> HAVE_AMD3DNOW

2009-01-26 08:36:06 +00:00

ffmpeg.c

revert r16717, r16718, r16719, EAGAIN handling, this causes FFserver to hang

2009-03-02 20:32:24 +00:00

ffplay.c

Document ffplay -ast, -vst, and -sst options.

2009-03-01 17:13:33 +00:00

ffserver.c

convert ffserver to new metadata API

2009-03-01 14:56:27 +00:00

ffserver.h

Add FFMPEG_ prefix to all multiple inclusion guards.

2007-10-17 09:37:46 +00:00

INSTALL

Clarify that we require GNU make 3.81+.

2008-11-08 19:47:10 +00:00

LICENSE

Merge OpenCORE AMR support from trunk.

2009-06-07 20:14:56 +00:00

MAINTAINERS

Add release managers, merged from trunk.

2010-03-01 17:58:50 +00:00

Makefile

Bail out if regtest-flashsv is run but zlib is not enabled.

2009-02-21 18:41:52 +00:00

output_example.c

Make output_example use av_interleaved_write_frame() instead of av_write_frame().

2009-02-18 11:46:14 +00:00

README

Merge split of README <-> LICENSE files along with the clarifications.

2009-04-13 10:11:31 +00:00

RELEASE

Release notes for 0.5.9

2012-06-09 12:13:27 +02:00

subdir.mak

missing hunk to unbreak linking with symbol versioning

2010-02-02 19:57:40 +00:00

VERSION

Bump version number for 0.5.9 release.

2012-06-03 22:42:30 +02:00

version.sh

Merge improved version number generation from trunk.

2009-03-31 21:11:04 +00:00

README

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.

Languages

C 90.9%

Assembly 7.2%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%