diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp index fa4b8191c4..f1dd803e8a 100644 --- a/Core/HW/MediaEngine.cpp +++ b/Core/HW/MediaEngine.cpp @@ -521,11 +521,7 @@ bool MediaEngine::setVideoStream(int streamNum, bool force) { m_pCodecCtx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT | AV_CODEC_FLAG_LOW_DELAY; - AVDictionary *opt = nullptr; - // Allow ffmpeg to use any number of threads it wants. Without this, it doesn't use threads. - av_dict_set(&opt, "threads", "0", 0); - int openResult = avcodec_open2(m_pCodecCtx, pCodec, &opt); - av_dict_free(&opt); + int openResult = avcodec_open2(m_pCodecCtx, pCodec, nullptr); if (openResult < 0) { return false; } diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 8f250abdd8..168d2eefd5 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -107,12 +107,10 @@ bool SimpleAudio::OpenCodec(int block_align) { codecCtx_->block_align = block_align; } - AVDictionary *opts = 0; - int retval = avcodec_open2(codecCtx_, codec_, &opts); + int retval = avcodec_open2(codecCtx_, codec_, nullptr); if (retval < 0) { ERROR_LOG(ME, "Failed to open codec: retval = %i", retval); } - av_dict_free(&opts); codecOpen_ = true; return retval >= 0; #else diff --git a/Core/MemFault.cpp b/Core/MemFault.cpp index 5cedc51738..d3b0dfc77c 100644 --- a/Core/MemFault.cpp +++ b/Core/MemFault.cpp @@ -268,6 +268,7 @@ bool HandleFault(uintptr_t hostAddress, void *ctx) { } } else { type = MemoryExceptionType::UNKNOWN; + } g_lastMemoryExceptionType = type;