Control: tags 1115027 + patch
Control: tags 1115027 + pending

Dear maintainer,

I've prepared an NMU for janus (versioned as 1.1.2-3.1) and uploaded
it to DELAYED/7. Please feel free to tell me if I should cancel it.

cu
Adrian
diffstat for janus-1.1.2 janus-1.1.2

 changelog                                                               |    7 +
 patches/2013-Fix-post-processor-compile-errors-with-FFmpeg-8-3586.patch |   63 ++++++++++
 patches/series                                                          |    1 
 3 files changed, 71 insertions(+)

diff -Nru janus-1.1.2/debian/changelog janus-1.1.2/debian/changelog
--- janus-1.1.2/debian/changelog	2025-07-23 00:43:18.000000000 +0300
+++ janus-1.1.2/debian/changelog	2026-01-03 17:51:07.000000000 +0200
@@ -1,3 +1,10 @@
+janus (1.1.2-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with FFmpeg 8. (Closes: #1115027)
+
+ -- Adrian Bunk <[email protected]>  Sat, 03 Jan 2026 17:51:07 +0200
+
 janus (1.1.2-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru janus-1.1.2/debian/patches/2013-Fix-post-processor-compile-errors-with-FFmpeg-8-3586.patch janus-1.1.2/debian/patches/2013-Fix-post-processor-compile-errors-with-FFmpeg-8-3586.patch
--- janus-1.1.2/debian/patches/2013-Fix-post-processor-compile-errors-with-FFmpeg-8-3586.patch	1970-01-01 02:00:00.000000000 +0200
+++ janus-1.1.2/debian/patches/2013-Fix-post-processor-compile-errors-with-FFmpeg-8-3586.patch	2026-01-03 17:50:14.000000000 +0200
@@ -0,0 +1,63 @@
+From ad5af69c901631b2c5d8b55e8e7a8970e189a953 Mon Sep 17 00:00:00 2001
+From: i8-pi <[email protected]>
+Date: Fri, 10 Oct 2025 21:45:41 +1100
+Subject: Fix post-processor compile errors with FFmpeg 8 (#3586)
+
+---
+ src/postprocessing/pp-g722.c | 4 +---
+ src/postprocessing/pp-h264.c | 4 ++--
+ src/postprocessing/pp-h265.c | 4 ++--
+ 3 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/postprocessing/pp-g722.c b/src/postprocessing/pp-g722.c
+index 709ebbd0..6685f76a 100644
+--- a/src/postprocessing/pp-g722.c
++++ b/src/postprocessing/pp-g722.c
+@@ -235,9 +235,7 @@ int janus_pp_g722_process(FILE *file, janus_pp_frame_packet *list, int *working)
+ 
+ void janus_pp_g722_close(void) {
+ 	/* Close decoder */
+-	avcodec_close(dec_ctx);
+-	av_free(dec_ctx);
+-	dec_ctx = NULL;
++	avcodec_free_context(&dec_ctx);
+ 	/* Flush and close file */
+ 	if(wav_file != NULL) {
+ 		/* Update the header */
+diff --git a/src/postprocessing/pp-h264.c b/src/postprocessing/pp-h264.c
+index ace2887a..468c4169 100644
+--- a/src/postprocessing/pp-h264.c
++++ b/src/postprocessing/pp-h264.c
+@@ -547,10 +547,10 @@ void janus_pp_h264_close(void) {
+ 		av_write_trailer(fctx);
+ #ifdef USE_CODECPAR
+ 	if(vEncoder != NULL)
+-		avcodec_close(vEncoder);
++		avcodec_free_context(&vEncoder);
+ #else
+ 	if(vStream != NULL && vStream->codec != NULL)
+-		avcodec_close(vStream->codec);
++		avcodec_free_context(&(vStream->codec));
+ #endif
+ 	if(fctx != NULL && fctx->streams[0] != NULL) {
+ #ifndef USE_CODECPAR
+diff --git a/src/postprocessing/pp-h265.c b/src/postprocessing/pp-h265.c
+index f988f415..b7f7dbaf 100644
+--- a/src/postprocessing/pp-h265.c
++++ b/src/postprocessing/pp-h265.c
+@@ -636,10 +636,10 @@ void janus_pp_h265_close(void) {
+ 		av_write_trailer(fctx);
+ #ifdef USE_CODECPAR
+ 	if(vEncoder != NULL)
+-		avcodec_close(vEncoder);
++		avcodec_free_context(&vEncoder);
+ #else
+ 	if(vStream != NULL && vStream->codec != NULL)
+-		avcodec_close(vStream->codec);
++		avcodec_free_context(&(vStream->codec));
+ #endif
+ 	if(fctx != NULL && fctx->streams[0] != NULL) {
+ #ifndef USE_CODECPAR
+-- 
+2.30.2
+
diff -Nru janus-1.1.2/debian/patches/series janus-1.1.2/debian/patches/series
--- janus-1.1.2/debian/patches/series	2025-07-23 00:43:18.000000000 +0300
+++ janus-1.1.2/debian/patches/series	2026-01-03 17:50:48.000000000 +0200
@@ -14,3 +14,4 @@
 2010_fix_ffmpeg_7.patch
 2011_fix_test_python3.11.patch
 2012_fix_test_avoid_rerunning_janus.patch
+2013-Fix-post-processor-compile-errors-with-FFmpeg-8-3586.patch

Reply via email to