From 54971bac8486cd6d925e9bc184d92c1e4ff44f45 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Fri, 22 Jul 2022 17:04:52 -0500 Subject: [PATCH] Removing some logic in FFmpegReader::Close which clears the video and audio stream - which can cause a crash if the decoder is still working on a packet. Reverting this code. --- src/FFmpegReader.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp index b2d5922d..8c5ae4bc 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp @@ -602,11 +602,6 @@ void FFmpegReader::Close() { ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::Close (Flush video context)"); avcodec_flush_buffers(pCodecCtx); - // Delete video stream - ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::Close (Clear video stream)"); - pStream = NULL; - videoStream = -1; - ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::Close (Free video context)"); AV_FREE_CONTEXT(pCodecCtx); #if USE_HW_ACCEL @@ -623,11 +618,6 @@ void FFmpegReader::Close() { ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::Close (Flush audio context)"); avcodec_flush_buffers(aCodecCtx); - // Delete audio stream - ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::Close (Clear audio stream)"); - aStream = NULL; - audioStream = -1; - ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::Close (Free audio context)"); AV_FREE_CONTEXT(aCodecCtx); }