eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-22 15:00:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "lavfi/avfiltergraph: add check before free the format"

Browse Source 
This reverts commit f156f4ab23.

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 <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit c4c10feaa8)
This commit is contained in:
Andreas Rheinhardt
2020-08-07 04:28:07 +02:00
parent 9d82cfe3de
commit 07b52a4b70
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/avfiltergraph.c
View File

@@ -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;