ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@gmail.com> | Fri Aug 7 04:28:07 2020 +0200| [c4c10feaa8c3604abfec4283715b37358f73b6e7] | committer: Andreas Rheinhardt
Revert "lavfi/avfiltergraph: add check before free the format" This reverts commit f156f4ab2317f22bfef33c7eaead0d5d5f162903. The checks added by said commit are nonsense because they did not help in case ff_merge_samplerates() or ff_merge_formats() returned NULL while freeing one of its arguments: Said freeing does not change the local variables of can_merge_formats(). Reviewed-by: Nicolas George <geo...@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4c10feaa8c3604abfec4283715b37358f73b6e7 --- libavfilter/avfiltergraph.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 2fe4f0b0f9..a149f8fb6d 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -419,10 +419,8 @@ static int can_merge_formats(AVFilterFormats *a_arg, av_freep(&ret); return 1; } else { - if (a) - av_freep(&a->formats); - if (b) - av_freep(&b->formats); + av_freep(&a->formats); + av_freep(&b->formats); av_freep(&a); av_freep(&b); return 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
