diff options
| author | MaranBr <maranbr@eden-emu.dev> | 2025-07-14 22:30:54 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-07-14 22:30:54 +0200 |
| commit | e9ca3f4c069b4ed4386d7086bc676c83e4334adc (patch) | |
| tree | 187ad179fe17af952bc400f4759d5db0a6e456ef /src/video_core/host1x/ffmpeg/ffmpeg.cpp | |
| parent | a8564a09b7b2aac98a0319d40f8e5bc6984f8f1d (diff) | |
[host1x] Fix FFmpeg crash on Linux (#37)
This fixes the FFmpeg crash on Linux / Steam Deck.
Credit to Maufeat for AVERROR_EOF check.
Co-authored-by: MaranBr <maranbr@outlook.com>
Co-authored-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/37
Co-authored-by: MaranBr <maranbr@eden-emu.dev>
Co-committed-by: MaranBr <maranbr@eden-emu.dev>
Diffstat (limited to 'src/video_core/host1x/ffmpeg/ffmpeg.cpp')
| -rw-r--r-- | src/video_core/host1x/ffmpeg/ffmpeg.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/host1x/ffmpeg/ffmpeg.cpp b/src/video_core/host1x/ffmpeg/ffmpeg.cpp index 5321c8c98c..d6eff2bdd7 100644 --- a/src/video_core/host1x/ffmpeg/ffmpeg.cpp +++ b/src/video_core/host1x/ffmpeg/ffmpeg.cpp @@ -216,18 +216,16 @@ 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) { + 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; } |