do 265 cleanup on toxav kill

zoff99 · Mar 17, 2024 · cf34a0e · cf34a0e
1 parent 92d82da
commit cf34a0e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/amalgamation/toxcore_amalgamation.c b/amalgamation/toxcore_amalgamation.c
@@ -75632,6 +75632,11 @@ void toxav_kill(ToxAV *av)
     pthread_mutex_unlock(av->toxav_endcall_mutex);
     pthread_mutex_destroy(av->toxav_endcall_mutex);
 
+#ifdef HAVE_H265_ENCODER
+    // HINT: to prevent leaks, cleanup x265
+    x265_cleanup();
+#endif
+
     free(av);
     av = nullptr;
 }
@@ -82659,8 +82664,6 @@ static void vc_kill_encoder_h265(VCSession *vc)
     x265_picture_free(vc->h265_in_pic);
     x265_picture_free(vc->h265_out_pic);
     x265_encoder_close(vc->h265_encoder);
-    // HINT: to prevent leaks, cleanup x265
-    x265_cleanup();
 }
 #endif
 

diff --git a/toxav/codecs/h264/codec.c b/toxav/codecs/h264/codec.c
@@ -2078,8 +2078,6 @@ static void vc_kill_encoder_h265(VCSession *vc)
     x265_picture_free(vc->h265_in_pic);
     x265_picture_free(vc->h265_out_pic);
     x265_encoder_close(vc->h265_encoder);
-    // HINT: to prevent leaks, cleanup x265
-    x265_cleanup();
 }
 #endif
 

diff --git a/toxav/toxav.c b/toxav/toxav.c
@@ -246,6 +246,11 @@ void toxav_kill(ToxAV *av)
     pthread_mutex_unlock(av->toxav_endcall_mutex);
     pthread_mutex_destroy(av->toxav_endcall_mutex);
 
+#ifdef HAVE_H265_ENCODER
+    // HINT: to prevent leaks, cleanup x265
+    x265_cleanup();
+#endif
+
     free(av);
     av = nullptr;
 }