diff --git a/src/video_core/host1x/ffmpeg/ffmpeg.cpp b/src/video_core/host1x/ffmpeg/ffmpeg.cpp
index 53dd376ab0..00cb9059e0 100644
--- a/src/video_core/host1x/ffmpeg/ffmpeg.cpp
+++ b/src/video_core/host1x/ffmpeg/ffmpeg.cpp
@@ -215,40 +215,36 @@ bool DecoderContext::OpenContext(const Decoder& decoder) {
 
 bool DecoderContext::SendPacket(const Packet& packet) {
 	m_temp_frame = std::make_shared<Frame>();
-	
     if (const int ret = avcodec_send_packet(m_codec_context, packet.GetPacket()); ret < 0 && ret != AVERROR_EOF) {
         LOG_ERROR(HW_GPU, "avcodec_send_packet error: {}", AVError(ret));
         return false;
     }
-	
     return true;
 }
 
 std::shared_ptr<Frame> DecoderContext::ReceiveFrame() {
 	auto ReceiveImpl = [&](AVFrame* frame) -> bool {
-		if (const int ret = avcodec_receive_frame(m_codec_context, frame); ret < 0) {
+		if (const int ret = avcodec_receive_frame(m_codec_context, frame); ret < 0 && ret != AVERROR_EOF) {
 			LOG_ERROR(HW_GPU, "avcodec_receive_frame error: {}", AVError(ret));
 			return false;
 		}
 		return true;
 	};
 
-	Frame intermediate_frame;
-	if (!ReceiveImpl(intermediate_frame.GetFrame())) {
+	std::shared_ptr<Frame> intermediate_frame = std::make_shared<Frame>();
+	if (!ReceiveImpl(intermediate_frame->GetFrame())) {
 		return {};
 	}
 
-	const auto desc = av_pix_fmt_desc_get(intermediate_frame.GetPixelFormat());
+	const auto desc = av_pix_fmt_desc_get(intermediate_frame->GetPixelFormat());
 	if (m_codec_context->hw_device_ctx && (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {
 		m_temp_frame->SetFormat(PreferredGpuFormat);
-		if (int ret = av_hwframe_transfer_data(m_temp_frame->GetFrame(), intermediate_frame.GetFrame(), 0); ret < 0) {
+		if (int ret = av_hwframe_transfer_data(m_temp_frame->GetFrame(), intermediate_frame->GetFrame(), 0); ret < 0) {
 			LOG_ERROR(HW_GPU, "av_hwframe_transfer_data error: {}", AVError(ret));
 			return {};
 		}
 	} else {
-        if(!ReceiveImpl(m_temp_frame->GetFrame())) {
-            return {};
-        }
+		m_temp_frame = std::move(intermediate_frame);
 	}
 
 	return std::move(m_temp_frame);