Browse Source

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 11b6a82412)

Conflicts:

	libavfilter/formats.c

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
tags/n0.5.11
Mina Nagy Zaki Reinhard Tartler 14 years ago
parent
commit
4475a7d88b
1 changed files with 3 additions and 0 deletions
  1. +3
    -0
      libavfilter/formats.c

+ 3
- 0
libavfilter/formats.c View File

@@ -43,6 +43,9 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
AVFilterFormats *ret;
unsigned i, j, k = 0;

if (a == b)
return a;

if (a == b)
return a;



Loading…
Cancel
Save