[vlc-devel] [PATCH 1/2] input: don't keep the sout reference when it's released
Steve Lhomme
robux4 at videolabs.io
Fri Apr 1 11:05:19 CEST 2016
these lines tell the resources not to provide the SOUT anymore so the input
shouldn't use it either
---
src/input/input.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/input/input.c b/src/input/input.c
index 4a0caf4..6d7c8ee 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -837,7 +837,8 @@ static int InitSout( input_thread_t * p_input )
}
else
{
- input_resource_RequestSout( p_input->p->p_resource, NULL, NULL );
+ p_input->p->p_sout = input_resource_RequestSout( p_input->p->p_resource,
+ NULL, NULL );
}
free( psz );
@@ -1247,7 +1248,7 @@ error:
if( p_input->p->p_resource )
{
if( p_input->p->p_sout )
- input_resource_RequestSout( p_input->p->p_resource,
+ p_input->p->p_sout = input_resource_RequestSout( p_input->p->p_resource,
p_input->p->p_sout, NULL );
input_resource_SetInput( p_input->p->p_resource, NULL );
if( p_input->p->p_resource_private )
@@ -1362,8 +1363,8 @@ static void End( input_thread_t * p_input )
vlc_mutex_unlock( &p_input->p->p_item->lock );
/* */
- input_resource_RequestSout( p_input->p->p_resource,
- p_input->p->p_sout, NULL );
+ p_input->p->p_sout = input_resource_RequestSout( p_input->p->p_resource,
+ p_input->p->p_sout, NULL );
input_resource_SetInput( p_input->p->p_resource, NULL );
if( p_input->p->p_resource_private )
input_resource_Terminate( p_input->p->p_resource_private );
--
2.7.0
More information about the vlc-devel
mailing list