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 07:47:21 +0000 (09:47 +0200)
commita4e277312cacfb78ef7583ed0b4fe4ccf5a0bcb1
treeb2a49f7a1f0b231909db6abe856eb18df9deb5ae
parentc82ae85a8a78a98f7c7fea68d24a4ac0ca74d01f
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>
libavfilter/formats.c