From 7c30321204be672ef1c7bc13be53062ffb65fb2a Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 23 Jun 2022 15:12:45 -0700 Subject: Rebuild against ffmpeg 5 Rename patch files to make them less vague. --- 1941.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 1941.patch (limited to '1941.patch') diff --git a/1941.patch b/1941.patch new file mode 100644 index 0000000..cd5e6c7 --- /dev/null +++ b/1941.patch @@ -0,0 +1,24 @@ +diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp +index 0a9641635f..997b4e30c6 100644 +--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp ++++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp +@@ -18,11 +18,14 @@ int FFmpeg_Decoder::readPacket(void *user_data, uint8_t *buf, int buf_size) + std::istream& stream = *static_cast(user_data)->mDataStream; + stream.clear(); + stream.read((char*)buf, buf_size); +- return stream.gcount(); ++ std::streamsize count = stream.gcount(); ++ if (count == 0) ++ return AVERROR_EOF; ++ return count; + } + catch (std::exception& ) + { +- return 0; ++ return AVERROR_UNKNOWN; + } + } + +-- +GitLab + -- cgit v1.2.1