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)
committerReinhard Tartler <siretart@tauware.de>
Fri, 4 Jan 2013 06:43:21 +0000 (07:43 +0100)
commit10c244cc89e80e1e924d442ccf40935bd7162178
treeb9f2fdb7ecc4d9d6440c9599d403ddd82a3607c1
parent99008ba3667a28af5efe0934aa20aa37df8dbd86
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