dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-21 19:15:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[host1x] Fix FFmpeg crash on Linux (#37)
All checks were successful
eden-build / source (push) Successful in 6m44s
Details
eden-build / linux (push) Successful in 26m24s
Details
eden-build / windows (msvc) (push) Successful in 30m47s
Details
eden-build / android (push) Successful in 34m10s
Details

Browse source 
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>
This commit is contained in:
MaranBr 2025-07-14 22:30:54 +02:00 • committed by crueter
parent a8564a09b7
commit e9ca3f4c06
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/video_core/host1x/ffmpeg/ffmpeg.cpp
View file

@ -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;
}