ffmpeg Update: Replace deprecated channel_layout with ch_layout struct

AirenSoft · May 25, 2024 · e135e5b · e135e5b
1 parent 776a674
commit e135e5b
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/projects/modules/ffmpeg/ffmpeg_conv.h b/src/projects/modules/ffmpeg/ffmpeg_conv.h
@@ -772,10 +772,15 @@ namespace ffmpeg
 				break;
 
 				case cmn::MediaType::Audio: {
-					codecpar->ch_layout.nb_channels	= static_cast<int>(media_track->GetChannel().GetCounts());
-					codecpar->channel_layout 		= ToAVChannelLayout(media_track->GetChannel().GetLayout());
-					codecpar->sample_rate 			= media_track->GetSample().GetRateNum();
-					codecpar->frame_size 			= (media_track->GetAudioSamplesPerFrame()!=0)?media_track->GetAudioSamplesPerFrame():1024;
+					uint64_t channel_layout = ToAVChannelLayout(media_track->GetChannel().GetLayout());
+					codecpar->ch_layout = {
+						.order = AVChannelOrder::AV_CHANNEL_ORDER_UNSPEC,
+						.nb_channels = static_cast<int>(media_track->GetChannel().GetCounts()),
+						.u = {.mask = channel_layout}
+					};
+
+					codecpar->sample_rate	= media_track->GetSample().GetRateNum();
+					codecpar->frame_size 	= (media_track->GetAudioSamplesPerFrame()!=0)?media_track->GetAudioSamplesPerFrame():1024;
 				}
 				break;