[FFmpeg-devel] [PATCH 38/39] fftools/ffprobe: Remove redundant check before avcodec_free_context()

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Fri May 21 12:17:41 EEST 2021


Besides being unnecessary it is also safer: If the error for an
unrecognized option were triggered (which seems to be impossible right
now), it might be that the stream whose codecpar is accessed is NULL.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 fftools/ffprobe.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index 88e82a4195..2d452c212e 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -3078,8 +3078,7 @@ static void close_input_file(InputFile *ifile)
 
     /* close decoder for each stream */
     for (i = 0; i < ifile->nb_streams; i++)
-        if (ifile->streams[i].st->codecpar->codec_id != AV_CODEC_ID_NONE)
-            avcodec_free_context(&ifile->streams[i].dec_ctx);
+        avcodec_free_context(&ifile->streams[i].dec_ctx);
 
     av_freep(&ifile->streams);
     ifile->nb_streams = 0;
-- 
2.27.0



More information about the ffmpeg-devel mailing list