-
Mina Nagy Zaki authored
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 11b6a824 ) Conflicts: libavfilter/formats.c Signed-off-by: Reinhard Tartler <siretart@tauware.de> (cherry picked from commit e5f4e249 ) Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit b6c5848a ) Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit a4e27731 ) Signed-off-by: Anton Khirnov <anton@khirnov.net>
0dfcbe52