FFmpeg/libavfilter
Mina Nagy Zaki 4475a7d88b 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>
2013-02-10 18:01:15 +01:00
..
allfilters.c replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_ 2009-01-14 17:19:17 +00:00
avfilter.c Reindent after the last commit, while at it also add some spaces for 2009-01-12 20:34:34 +00:00
avfilter.h Implement in AVFilterGraph the scale_sws_opts field, and pass its 2009-02-23 23:45:21 +00:00
avfiltergraph.c Rename avfilter_destroy_graph() to avfilter_graph_destroy(), for better 2009-02-26 22:02:09 +00:00
avfiltergraph.h Rename avfilter_destroy_graph() to avfilter_graph_destroy(), for better 2009-02-26 22:02:09 +00:00
defaults.c Implement the avfilter_default_draw_slice() handler and use it in 2009-01-11 22:05:48 +00:00
formats.c lavfi: avfilter_merge_formats: handle case where inputs are same 2013-02-10 18:01:15 +01:00
graphparser.c Rename avfilter_parse_graph() to avfilter_graph_parse(), for better 2009-02-26 22:03:55 +00:00
graphparser.h Rename avfilter_parse_graph() to avfilter_graph_parse(), for better 2009-02-26 22:03:55 +00:00
libavfilter.v backport symbol versioning patch 2010-02-01 16:00:09 +00:00
Makefile cosmetics: Consistently place HEADERS before OBJS in all Makefiles. 2008-11-20 22:53:18 +00:00