From 9c7af40f8b2d4388b1ec6412fc0c82e2fccbff8c Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux Date: Tue, 2 Nov 2021 16:12:41 +0900 Subject: [PATCH] Revert "video_output: move release after display" This reverts commit 710c0472eb8031ae2b45e17a9ada92eec507c414. --- include/vlc_vout_display.h | 1 + src/video_output/video_output.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h index cadbabd52a..1097a282ba 100644 --- a/include/vlc_vout_display.h +++ b/include/vlc_vout_display.h @@ -430,6 +430,7 @@ static inline void vout_display_Display(vout_display_t *vd, picture_t *picture) { if (vd->ops->display != NULL) vd->ops->display(vd, picture); + picture_Release(picture); } VLC_API diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 28d8f26e46..89f4979479 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1634,7 +1634,8 @@ static int RenderPicture(vout_thread_sys_t *vout, bool render_now) NS_FROM_VLC_TICK(system_pts == INT64_MAX ? system_now : system_pts)); } } - picture_Release(todisplay); + else + picture_Release(todisplay); if (atomic_load(&sys->b_display_avstat)) {