[vlc-commits] resource: inline propagate RequestSout()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jan 19 19:42:16 2021 +0200| [0c311bfbda0f05cfea613d71ab0ce3aa0b69bff5] | committer: Rémi Denis-Courmont

resource: inline propagate RequestSout()

...and input_resource_RequestSout() into input_resource_TerminateSout().
No functional changes.

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

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

diff --git a/src/input/resource.c b/src/input/resource.c
index ff05b5a32b..044fb8b7e5 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -629,7 +629,10 @@ sout_instance_t *input_resource_RequestSout( input_resource_t *p_resource, sout_
 
     return p_ret;
 }
+
 void input_resource_TerminateSout( input_resource_t *p_resource )
 {
-    input_resource_RequestSout( p_resource, NULL, NULL );
+    vlc_mutex_lock( &p_resource->lock );
+    DestroySout(p_resource);
+    vlc_mutex_unlock( &p_resource->lock );
 }