X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavfilter%2Favfiltergraph.c;h=506d79ec7144036675eaa11045adfd48ef8d096e;hp=2db2900ea8ee2d7809fd11fde4ec80306cc72e55;hb=52aed19307ee0768b03a620005c4b2b5fda621c6;hpb=6ef30976e00a07ed7c6db54102d2ba50d24c876c diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 2db2900ea8..506d79ec71 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -392,6 +392,19 @@ static int can_merge_formats(AVFilterFormats *a_arg, return 1; a = clone_filter_formats(a_arg); b = clone_filter_formats(b_arg); + + if (!a || !b) { + if (a) + av_freep(&a->formats); + if (b) + av_freep(&b->formats); + + av_freep(&a); + av_freep(&b); + + return 0; + } + if (is_sample_rate) { ret = ff_merge_samplerates(a, b); } else {