From dfcbcc2a0a1ebfe5fe7ddb43bd9adb33e8b9b73c Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Wed, 18 Jan 2023 10:16:21 +0100 Subject: [PATCH] Ran astyle --- neo/renderer/Cinematic.cpp | 6 +++--- neo/renderer/NVRHI/Image_NVRHI.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/neo/renderer/Cinematic.cpp b/neo/renderer/Cinematic.cpp index 51717654..1743a740 100644 --- a/neo/renderer/Cinematic.cpp +++ b/neo/renderer/Cinematic.cpp @@ -757,11 +757,11 @@ bool idCinematicLocal::InitFromFFMPEGFile( const char* qpath, bool amilooping, n } common->Printf( "Cinematic audio stream found: Sample Rate=%d Hz, Channels=%d, Format=%s, Planar=%d\n", dec_ctx2->sample_rate, #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,37,100) - dec_ctx2->ch_layout.nb_channels, + dec_ctx2->ch_layout.nb_channels, #else - dec_ctx2->channels, + dec_ctx2->channels, #endif - GetSampleFormat( dec_ctx2->sample_fmt ), hasplanar ); + GetSampleFormat( dec_ctx2->sample_fmt ), hasplanar ); #if defined(_MSC_VER) && !defined(USE_OPENAL) cinematicAudio = new( TAG_AUDIO ) CinematicAudio_XAudio2; diff --git a/neo/renderer/NVRHI/Image_NVRHI.cpp b/neo/renderer/NVRHI/Image_NVRHI.cpp index 2504cf6e..b73b2232 100644 --- a/neo/renderer/NVRHI/Image_NVRHI.cpp +++ b/neo/renderer/NVRHI/Image_NVRHI.cpp @@ -76,7 +76,7 @@ idImage::~idImage idImage::~idImage() { PurgeImage(); - + // SRS - if image found in deferred load list, remove it now to avoid problems later DeferredPurgeImage(); }