Make suggested changes

- check for av_find_best_stream() AVCodec pointer constness correctly - do no split expression in ffmpeg_utility.cpp with a preprocessor macro
telegramdesktop · Feb 24, 2025 · 743fa48 · 743fa48
1 parent 3fa287a
commit 743fa48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
@@ -546,9 +546,10 @@ SwresamplePointer MakeSwresamplePointer(
 	}
 
 	// Initialize audio resampler
+	AvErrorWrap error;
 #if DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	auto result = (SwrContext*)nullptr;
-	auto error = AvErrorWrap(swr_alloc_set_opts2(
+	error = AvErrorWrap(swr_alloc_set_opts2(
 		&result,
 		dstLayout,
 		dstFormat,
@@ -576,7 +577,6 @@ SwresamplePointer MakeSwresamplePointer(
 	if (!result) {
 		LogError(u"swr_alloc_set_opts"_q);
 	}
-	auto
 #endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
 
 	error = AvErrorWrap(swr_init(result));

diff --git a/Telegram/SourceFiles/media/audio/media_audio_local_cache.cpp b/Telegram/SourceFiles/media/audio/media_audio_local_cache.cpp
@@ -45,7 +45,7 @@ constexpr auto kFrameSize = 4096;
 	}
 
 
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 79, 100)
 	auto inCodec = (const AVCodec*)nullptr;
 #else
 	auto inCodec = (AVCodec*)nullptr;