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 11b6a82412bcd372adf694a26d83b07d337e1325)

Conflicts:

	libavfilter/formats.c

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

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

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-10-06 09:47:21 +02:00
2012-06-08 15:20:14 -04:00
2011-03-18 18:34:49 +01:00
2010-05-19 11:46:39 +00:00
2011-03-18 18:34:49 +01:00
2011-03-18 18:34:49 +01:00
2010-04-27 23:22:30 +00:00
2011-03-18 18:34:49 +01:00
2011-03-18 18:34:49 +01:00
2011-03-18 18:34:49 +01:00
2012-06-09 12:05:53 +02:00
2012-06-03 22:42:54 +02:00

Libav README
-------------

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.
Description
No description provided
Readme 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%