lavfi: avfilter_merge_formats: handle case where inputs are same
authorMina Nagy Zaki <mnzaki@gmail.com>
Wed, 8 Jun 2011 16:24:25 +0000 (19:24 +0300)
committerAnton Khirnov <anton@khirnov.net>
Sat, 6 Oct 2012 06:43:43 +0000 (08:43 +0200)
commite5f4e249422834f727bcd432b73af971277f1371
tree8350e09ea43d49623fee5d2bd78c523d70b6508c
parentb1ad5a21da7ac56b853b6a21ed08a075ecbb89c6
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>
libavfilter/formats.c