[vlc-commits] vout: avoid re-triggering callbacks when reused

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Apr 10 16:03:39 2017 +0200| [7cc833cc6fec16e935befb472df09fc73a163a10] | committer: Thomas Guillem

vout: avoid re-triggering callbacks when reused

This commit avoids callbacks being triggered (that could lead to filter-chain
re-initialisation) when the video is closing (without being re-used after).

vout callbacks should be re-triggered just before being re-used and not after
being saved.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7cc833cc6fec16e935befb472df09fc73a163a10
---

 src/video_output/video_output.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 11387d151c..4ba5640605 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -243,11 +243,11 @@ vout_thread_t *vout_Request(vlc_object_t *object,
 
             vout_control_Push(&vout->p->control, &cmd);
             vout_control_WaitEmpty(&vout->p->control);
+            vout_IntfReinit(vout);
         }
 
         if (!vout->p->dead) {
             msg_Dbg(object, "reusing provided vout");
-            vout_IntfReinit(vout);
             return vout;
         }
         vout_CloseAndRelease(vout);