ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4327 from faginbagin/1.36-mono-channel 

Fix deprecated AVCodecContext::channel_layout to use ch_layout
release-1.36
Isaac Connor 2025-05-20 12:21:21 -04:00 committed by GitHub
parent 97ba883c1a a9c39ebcad
commit abb0fa7870
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zm_videostore.cpp
View File

@ -854,9 +854,17 @@ bool VideoStore::setup_resampler() {
Debug(2, "Got something other than AAC (%s)", audio_in_codec->name); Debug(2, "Got something other than AAC (%s)", audio_in_codec->name);
#if LIBAVCODEC_VERSION_CHECK(59, 24, 100, 24, 100)
#else
// Some formats (i.e. WAV) do not produce the proper channel layout // Some formats (i.e. WAV) do not produce the proper channel layout
#if LIBAVCODEC_VERSION_CHECK(59, 24, 100, 24, 100)
// channel_layout is deprecated need to use ch_layout
// based on changes to ffmpeg/doc/examples/transcoding.c
if (audio_in_ctx->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) {
char buf[64];
av_channel_layout_default(&audio_in_ctx->ch_layout, audio_in_ctx->ch_layout.nb_channels);
ret = av_channel_layout_describe(&audio_in_ctx->ch_layout, buf, sizeof(buf));
Info( "Setting input channel layout fron unspecified to default ret=%d describe=%s)", ret, buf);
}
#else
if (audio_in_ctx->channel_layout == 0) { if (audio_in_ctx->channel_layout == 0) {
Debug(2, "Setting input channel layout to mono"); Debug(2, "Setting input channel layout to mono");
// Perhaps we should not be modifying the audio_in_ctx.... // Perhaps we should not be modifying the audio_in_ctx....