Commit bfa286d3 authored by Gildas Bazin's avatar Gildas Bazin

* src/input/input.c: fixed previous fix (sout needs to be destroyed after the ES).
parent 6ae3f4f4
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* decoders. * decoders.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2002 VideoLAN * Copyright (C) 1998-2002 VideoLAN
* $Id: input.c,v 1.259 2003/11/22 12:41:31 gbazin Exp $ * $Id: input.c,v 1.260 2003/11/22 13:19:30 gbazin Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -805,6 +805,12 @@ static void EndThread( input_thread_t * p_input ) ...@@ -805,6 +805,12 @@ static void EndThread( input_thread_t * p_input )
input_DumpStream( p_input ); input_DumpStream( p_input );
/* Free demultiplexer's data */
module_Unneed( p_input, p_input->p_demux );
/* Free all ES and destroy all decoder threads */
input_EndStream( p_input );
/* Close optional stream output instance */ /* Close optional stream output instance */
if ( p_input->stream.p_sout != NULL ) if ( p_input->stream.p_sout != NULL )
{ {
...@@ -843,12 +849,6 @@ static void EndThread( input_thread_t * p_input ) ...@@ -843,12 +849,6 @@ static void EndThread( input_thread_t * p_input )
/* Free input_thread_sys_t */ /* Free input_thread_sys_t */
free( p_input->p_sys ); free( p_input->p_sys );
/* Free demultiplexer's data */
module_Unneed( p_input, p_input->p_demux );
/* Free all ES and destroy all decoder threads */
input_EndStream( p_input );
/* Destroy the stream_t facilities */ /* Destroy the stream_t facilities */
stream_Release( p_input->s ); stream_Release( p_input->s );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment