From 6ce92ec75ee99ad6be2c1a192b549357bd472b01 Mon Sep 17 00:00:00 2001 From: Johan Bilien Date: Thu, 28 Mar 2002 03:53:15 +0000 Subject: [PATCH] * When unselecting an ES, we must ged rid of p_es->p_pes so that it is regererated when we select this ES again. It made vlc segfault when switching from some stream to another, or when switching program in satellite input. --- plugins/satellite/input_satellite.c | 1 - src/input/input_programs.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/satellite/input_satellite.c b/plugins/satellite/input_satellite.c index 55d8c66d37..2fee8cb7f5 100644 --- a/plugins/satellite/input_satellite.c +++ b/plugins/satellite/input_satellite.c @@ -311,7 +311,6 @@ int SatelliteSetProgram( input_thread_t * p_input, if ( p_es->p_decoder_fifo ) { input_UnselectES( p_input , p_es ); - p_es->p_pes = NULL; /* FIXME */ } if ( p_es->i_dmx_fd ) { diff --git a/src/input/input_programs.c b/src/input/input_programs.c index 48c2cffd8f..d0f1f40f2d 100644 --- a/src/input/input_programs.c +++ b/src/input/input_programs.c @@ -2,7 +2,7 @@ * input_programs.c: es_descriptor_t, pgrm_descriptor_t management ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: input_programs.c,v 1.76 2002/03/21 02:27:04 jobi Exp $ + * $Id: input_programs.c,v 1.77 2002/03/28 03:53:15 jobi Exp $ * * Authors: Christophe Massiot * @@ -692,6 +692,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es ) } input_EndDecoder( p_input, p_es ); + free( p_es->p_pes ); if( ( p_es->p_decoder_fifo == NULL ) && ( p_input->stream.i_selected_es_number > 0 ) ) -- 2.39.2