diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-06-23 15:12:45 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-06-23 15:12:45 -0700 |
| commit | 7c30321204be672ef1c7bc13be53062ffb65fb2a (patch) | |
| tree | 4788722a11aa909cdeff2fc558dc6c18d113418e /1941.patch | |
| parent | Switch to arch packaged bullet-dp fo depends. (diff) | |
| download | openmw-7c30321204be672ef1c7bc13be53062ffb65fb2a.tar.xz | |
Rebuild against ffmpeg 5
Rename patch files to make them less vague.
Diffstat (limited to '1941.patch')
| -rw-r--r-- | 1941.patch | 24 |
1 files changed, 24 insertions, 0 deletions
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<FFmpeg_Decoder*>(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 + |