Mina Nagy Zaki a4e277312c 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>		2012-10-06 09:47:21 +02:00
..
allfilters.c	Add unsharp video filter.	2010-04-07 01:05:24 +00:00
avfilter.c	Add version to AVClass so we can add to and use fields of AVClass without ABI issues.	2010-04-28 20:00:23 +00:00
avfilter.h	Bump libavfilter minor version and Changelog for unsharp filter	2010-04-10 20:34:44 +00:00
avfiltergraph.c	Fix leak in avfilter_graph_add_filter().	2010-04-18 20:10:43 +00:00
avfiltergraph.h	Apply grammar/consistency nits to avfilter_graph_add_filter() doxy.	2010-04-11 21:26:00 +00:00
defaults.c	Create a set of null callback functions.	2010-03-18 23:12:48 +00:00
formats.c	lavfi: avfilter_merge_formats: handle case where inputs are same	2012-10-06 09:47:21 +02:00
graphparser.c
graphparser.h
libavfilter.v	Add symbol versioning for shared libraries	2010-01-16 04:49:02 +00:00
Makefile	Add unsharp video filter.	2010-04-07 01:05:24 +00:00
parseutils.c	Remove explicit filename from Doxygen @file commands.	2010-04-20 14:45:34 +00:00
parseutils.h	Remove explicit filename from Doxygen @file commands.	2010-04-20 14:45:34 +00:00
vf_aspect.c	Remove explicit filename from Doxygen @file commands.	2010-04-20 14:45:34 +00:00
vf_crop.c	Remove explicit filename from Doxygen @file commands.	2010-04-20 14:45:34 +00:00
vf_format.c	Remove explicit filename from Doxygen @file commands.	2010-04-20 14:45:34 +00:00
vf_null.c	Remove explicit filename from Doxygen @file commands.	2010-04-20 14:45:34 +00:00
vf_scale.c	Remove explicit filename from Doxygen @file commands.	2010-04-20 14:45:34 +00:00
vf_slicify.c	Remove explicit filename from Doxygen @file commands.	2010-04-20 14:45:34 +00:00
vf_unsharp.c	Remove explicit filename from Doxygen @file commands.	2010-04-20 14:45:34 +00:00
vf_vflip.c	Remove explicit filename from Doxygen @file commands.	2010-04-20 14:45:34 +00:00
vsink_nullsink.c	Define AVMediaType enum, and use it instead of enum CodecType, which	2010-03-30 23:30:55 +00:00
vsrc_nullsrc.c	Remove explicit filename from Doxygen @file commands.	2010-04-20 14:45:34 +00:00