[vlc-commits] [Git][videolan/vlc][master] vout: stop even when display is missing

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
05c8dd3f by Alaric Senat at 2023-06-30T12:31:35+00:00
vout: stop even when display is missing

`vout_Stop` should be called even if the display is missing as it is
also charged to disable the window if its still open. The display NULL
check is done anyway at the correct place in `vout_Stop` itself.

This fixes an assert with the `display` stream output that never closes
the window because `input_resource_StopFreeVout` is not enforced
compared to the classic playback scenario.

Here's the assert fixed by this patch:

```
vlc: ../../src/video_output/video_output.c:1948: vout_Release: Assertion `!sys->window_enabled' failed.
[5] from 0x00007ffff6c5f29c in vout_Release+1019 at ../../src/video_output/video_output.c:1948
[6] from 0x00007ffff6c5ee9a in vout_Close+698 at ../../src/video_output/video_output.c:1926
[7] from 0x00007ffff6bce970 in DestroyVout+840 at ../../src/input/resource.c:159
[8] from 0x00007ffff6bd0609 in input_resource_Release+99 at ../../src/input/resource.c:334
[9] from 0x00007fffd89b6e68 in Close+274 at ../../modules/stream_out/display.c:265
```

- - - - -


1 changed file:

- src/video_output/video_output.c


Changes:

=====================================
src/video_output/video_output.c
=====================================
@@ -1915,8 +1915,7 @@ void vout_Close(vout_thread_t *vout)
     vout_thread_sys_t *sys = VOUT_THREAD_TO_SYS(vout);
     assert(!sys->dummy);
 
-    if (sys->display != NULL)
-        vout_Stop(vout);
+    vout_Stop(vout);
 
     vout_IntfDeinit(VLC_OBJECT(vout));
     vout_snapshot_End(sys->snapshot);



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/05c8dd3f5f848731a87576f56e2af27ea2bf2b4a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/05c8dd3f5f848731a87576f56e2af27ea2bf2b4a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance