mirror of
https://github.com/libretro/FFmpeg.git
synced 2026-11-13 17:39:29 -10:00
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 <[email protected]> (cherry picked from commit11b6a82412) Conflicts: libavfilter/formats.c Signed-off-by: Reinhard Tartler <[email protected]> (cherry picked from commite5f4e24942) Signed-off-by: Anton Khirnov <[email protected]> (cherry picked from commitb6c5848a1f) Signed-off-by: Anton Khirnov <[email protected]>