From e72aa91a6d8feee4678ce8b0fe2e2aae282bca99 Mon Sep 17 00:00:00 2001 From: Jim Date: Sat, 26 Nov 2022 08:44:16 -0800 Subject: [PATCH] obs-qsv11: Keep ExtParam value around This wasn't meant to be freed in InitParams --- plugins/obs-qsv11/QSV_Encoder_Internal.cpp | 4 ---- plugins/obs-qsv11/QSV_Encoder_Internal.h | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/obs-qsv11/QSV_Encoder_Internal.cpp b/plugins/obs-qsv11/QSV_Encoder_Internal.cpp index d7077f61b..78e4b27e1 100644 --- a/plugins/obs-qsv11/QSV_Encoder_Internal.cpp +++ b/plugins/obs-qsv11/QSV_Encoder_Internal.cpp @@ -61,8 +61,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include - #define do_log(level, format, ...) \ blog(level, "[qsv encoder: '%s'] " format, "msdk_impl", ##__VA_ARGS__) @@ -300,8 +298,6 @@ mfxStatus QSV_Encoder_Internal::InitParams(qsv_param_t *pParams, (mfxU16)(pParams->nKeyIntSec * pParams->nFpsNum / (float)pParams->nFpsDen); - std::vector extendedBuffers; - if (m_ver.Major == 1 && m_ver.Minor >= 8) { memset(&m_co2, 0, sizeof(mfxExtCodingOption2)); m_co2.Header.BufferId = MFX_EXTBUFF_CODING_OPTION2; diff --git a/plugins/obs-qsv11/QSV_Encoder_Internal.h b/plugins/obs-qsv11/QSV_Encoder_Internal.h index 01c25763d..0b7197ef0 100644 --- a/plugins/obs-qsv11/QSV_Encoder_Internal.h +++ b/plugins/obs-qsv11/QSV_Encoder_Internal.h @@ -59,6 +59,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "QSV_Encoder.h" #include "common_utils.h" +#include + class QSV_Encoder_Internal { public: QSV_Encoder_Internal(mfxIMPL &impl, mfxVersion &version); @@ -111,6 +113,7 @@ private: mfxU16 m_nSPSBufferSize; mfxU16 m_nPPSBufferSize; mfxVideoParam m_parameter; + std::vector extendedBuffers; mfxExtCodingOption3 m_co3; mfxExtCodingOption2 m_co2; mfxExtCodingOption m_co;