Ensure channel layouts are cleaned up

STAR070 · Aug 23, 2022 · f3d1c56 · f3d1c56
1 parent 9c30b15
commit f3d1c56
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/decoder/LAVAudio/PostProcessor.cpp b/decoder/LAVAudio/PostProcessor.cpp
@@ -585,9 +585,11 @@ HRESULT CLAVAudio::PerformAVRProcessing(BufferDetails *buffer)
     if (!m_swrContext)
     {
         DbgLog((LOG_ERROR, 10, L"swresample context missing?"));
-        return E_FAIL;
+        goto setuperr;
     }
 
+    av_channel_layout_uninit(&chMixingLayout);
+
     LAVAudioSampleFormat bufferFormat =
         (m_sfRemixFormat == SampleFormat_24) ? SampleFormat_32 : m_sfRemixFormat; // avresample always outputs 32-bit
 
@@ -616,6 +618,7 @@ HRESULT CLAVAudio::PerformAVRProcessing(BufferDetails *buffer)
 setuperr:
     swr_free(&m_swrContext);
     m_bAVResampleFailed = TRUE;
+    av_channel_layout_uninit(&chMixingLayout);
     return E_FAIL;
 }
 
@@ -755,5 +758,6 @@ HRESULT CLAVAudio::PostProcess(BufferDetails *buffer)
         Truncate32Buffer(buffer);
     }
 
+    av_channel_layout_uninit(&chMixingLayout);
     return S_OK;
 }