mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-02 04:36:41 +00:00
Code Issues Releases Wiki Activity

Catch exceptions in VideoThread

Browse source
This commit is contained in:
Evil Eye 2021-05-09 13:20:53 +02:00
parent 2042a66cf3
commit de37ca8e2c
2 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -121,6 +121,7 @@
Bug #5975: NIF controllers from sheath meshes are used Bug #5975: NIF controllers from sheath meshes are used
Bug #5991: Activate should always be allowed for inventory items Bug #5991: Activate should always be allowed for inventory items
Bug #5995: NiUVController doesn't calculate the UV offset properly Bug #5995: NiUVController doesn't calculate the UV offset properly
Bug #6007: Crash when ending cutscene is playing
Bug #6016: Greeting interrupts Fargoth's sneak-walk Bug #6016: Greeting interrupts Fargoth's sneak-walk
Feature #390: 3rd person look "over the shoulder" Feature #390: 3rd person look "over the shoulder"
Feature #832: OpenMW-CS: Handle deleted references Feature #832: OpenMW-CS: Handle deleted references

7
extern/osg-ffmpeg-videoplayer/videostate.cpp vendored
View file

@ -409,6 +409,8 @@ public:
pFrame = av_frame_alloc(); pFrame = av_frame_alloc();
try
{
while(self->videoq.get(packet, self) >= 0) while(self->videoq.get(packet, self) >= 0)
{ {
if(packet->data == flush_pkt.data) if(packet->data == flush_pkt.data)
@ -446,6 +448,11 @@ public:
} }
} }
} }
}
catch(std::exception& e)
{
std::cerr << "An error occurred playing the video: " << e.what () << std::endl;
}
av_packet_unref(packet); av_packet_unref(packet);