Fix mem-leak in GetAVMediaFileProp

BearWare · Nov 3, 2024 · b9622a0 · b9622a0
1 parent a936aa5
commit b9622a0
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/Library/TeamTalkLib/avstream/FFmpegStreamer.cpp b/Library/TeamTalkLib/avstream/FFmpegStreamer.cpp
@@ -224,10 +224,10 @@ bool GetAVMediaFileProp(const ACE_TString& filename, MediaFileProp& out_prop)
     out_prop.filename = filename;
 
     if (aud_dec_ctx)
-        avcodec_close(aud_dec_ctx);
+        avcodec_free_context(&aud_dec_ctx);
 
-    if(vid_dec_ctx)
-        avcodec_close(vid_dec_ctx);
+    if (vid_dec_ctx)
+        avcodec_free_context(&vid_dec_ctx);
 
     avformat_close_input(&fmt_ctx);
 
@@ -578,15 +578,14 @@ void FFmpegStreamer::Run()
         m_statuscallback(m_media_in, MEDIASTREAM_ERROR);
 
 end:
-    if(audio_filter_graph)
+    if (audio_filter_graph)
         avfilter_graph_free(&audio_filter_graph);
-    avcodec_close(aud_dec_ctx);
-    if(video_filter_graph)
+    if (aud_dec_ctx)
+        avcodec_free_context(&aud_dec_ctx);
+    if (video_filter_graph)
         avfilter_graph_free(&video_filter_graph);
     if (vid_dec_ctx)
         avcodec_free_context(&vid_dec_ctx);
-    // if(options)
-    //     av_dict_free(&options); //causes crash...
     if(fmt_ctx)
         avformat_close_input(&fmt_ctx);
     av_frame_free(&aud_frame);