From 34014f5b6d8e66c96c6a84e8312d1938b097f351 Mon Sep 17 00:00:00 2001 From: Hendi Date: Fri, 6 Jan 2023 01:14:08 +0100 Subject: [PATCH] ffmpegdec: Fix system freeze at end of playback with ffmpeg 4.0+ --- src/driver/audiodec/ffmpegdec.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/driver/audiodec/ffmpegdec.cpp b/src/driver/audiodec/ffmpegdec.cpp index ffa57970b..a176cfcb6 100644 --- a/src/driver/audiodec/ffmpegdec.cpp +++ b/src/driver/audiodec/ffmpegdec.cpp @@ -104,7 +104,15 @@ int CFfmpegDec::Read(void *buf, size_t buf_size) static int read_packet(void *opaque, uint8_t *buf, int buf_size) { +#if LIBAVFORMAT_VERSION_MAJOR < 58 return ((CFfmpegDec *) opaque)->Read(buf, (size_t) buf_size); +#else + // ffmpeg 4.0+: read_packet MUST return a valid AVERROR code instead of 0. + int len = ((CFfmpegDec *) opaque)->Read(buf, (size_t) buf_size); + if (len == 0) + return AVERROR_EOF; + return len; +#endif } int64_t CFfmpegDec::Seek(int64_t offset, int whence)