[vlc-commits] resource: inline code of input_resource_TerminateVout()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jan 18 19:43:37 2019 +0200| [6e93268661741022e7b0826c75066201f862a4b6] | committer: Rémi Denis-Courmont

resource: inline code of input_resource_TerminateVout()

(a second time)

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

 src/input/resource.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/input/resource.c b/src/input/resource.c
index d795e0b286..cd18508b86 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -491,7 +491,12 @@ void input_resource_HoldVouts( input_resource_t *p_resource, vout_thread_t ***pp
 void input_resource_TerminateVout( input_resource_t *p_resource )
 {
     vlc_mutex_lock(&p_resource->lock);
-    RequestVout(p_resource, NULL, false);
+    if (p_resource->p_vout_free != NULL)
+    {
+        msg_Dbg(p_resource->p_vout_free, "destroying useless vout");
+        vout_CloseAndRelease(p_resource->p_vout_free);
+        p_resource->p_vout_free = NULL;
+    }
     vlc_mutex_unlock(&p_resource->lock);
 }