Merge ~liushuyu-011/ubuntu/+source/janus:ubuntu/devel into ubuntu/+source/janus:ubuntu/devel

[Zixing Liu]

This merge proposal fixes incompatibilities with FFmpeg 7 for Janus.

[Graham Inggs (ginggs)]

Looks good to me, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index e195bd0..86de9f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+janus (1.1.2-1ubuntu1) oracular; urgency=medium
+
+  * d/p/2010_fix_ffmpeg_7.patch: fix FTBFS with FFmpeg 7
+
+ -- Zixing Liu <[e-mail]>  Tue, 17 Sep 2024 13:01:53 -0600
+
 janus (1.1.2-1build5) noble; urgency=medium
 
   * No-change rebuild against libssl3t64.
diff --git a/debian/patches/2010_fix_ffmpeg_7.patch b/debian/patches/2010_fix_ffmpeg_7.patch
new file mode 100644
index 0000000..3a5f0f1
--- /dev/null
+++ b/debian/patches/2010_fix_ffmpeg_7.patch
@@ -0,0 +1,27 @@
+Description: Fix FTBFS with FFmpeg 7
+Author: Zixing Liu <[e-mail]>
+Forwarded: no
+Last-Update: 2024-09-17
+---
+--- janus-1.1.2.orig/src/postprocessing/pp-avformat.c
++++ janus-1.1.2/src/postprocessing/pp-avformat.c
+@@ -64,7 +64,7 @@ AVStream *janus_pp_new_audio_avstream(AV
+ 	c->codec_id = codec_id;
+ 	c->codec_type = AVMEDIA_TYPE_AUDIO;
+ 	c->sample_rate = samplerate;
+-	c->channels = channels;
++	av_channel_layout_default(&c->ch_layout, channels);
+ 	if(extradata) {
+ 		c->extradata_size = size;
+ 		c->extradata = av_memdup(extradata, size);
+--- janus-1.1.2.orig/src/postprocessing/pp-g722.c
++++ janus-1.1.2/src/postprocessing/pp-g722.c
+@@ -212,7 +212,7 @@ int janus_pp_g722_process(FILE *file, ja
+ 				int data_size = av_get_bytes_per_sample(dec_ctx->sample_fmt);
+ 				int i=0, ch=0;
+ 				for(i=0; i<frame->nb_samples; i++) {
+-					for(ch=0; ch<dec_ctx->channels; ch++) {
++					for(ch=0; ch<dec_ctx->ch_layout.nb_channels; ch++) {
+ 						fwrite(frame->data[ch] + data_size*i, 1, data_size, wav_file);
+ 					}
+ 				}
diff --git a/debian/patches/series b/debian/patches/series
index 61ae7e0..1383b83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 2007_use_shared_janus.patch
 2008_avoid_virtualbg.patch
 2009_rollup_3.patch
+2010_fix_ffmpeg_7.patch