Commit a02533c3 authored by Gildas Bazin's avatar Gildas Bazin

* include/vlc_es.h: s/es_format_Free/es_format_Clean.
parent f6fd063a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlc_es.h: Elementary stream formats descriptions * vlc_es.h: Elementary stream formats descriptions
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: vlc_es.h,v 1.9 2004/02/07 00:16:34 gbazin Exp $ * $Id: vlc_es.h,v 1.10 2004/02/07 00:33:08 gbazin Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -196,12 +196,16 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src ) ...@@ -196,12 +196,16 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
} }
} }
static inline void es_format_Free( es_format_t *fmt ) static inline void es_format_Clean( es_format_t *fmt )
{ {
if( fmt->psz_language ) free( fmt->psz_language ); if( fmt->psz_language ) free( fmt->psz_language );
fmt->psz_language = 0;
if( fmt->psz_description ) free( fmt->psz_description ); if( fmt->psz_description ) free( fmt->psz_description );
fmt->psz_description = 0;
if( fmt->i_extra > 0 ) free( fmt->p_extra ); if( fmt->i_extra > 0 ) free( fmt->p_extra );
fmt->i_extra = 0; fmt->p_extra = 0;
if( fmt->video.p_palette ) free( fmt->video.p_palette ); if( fmt->video.p_palette ) free( fmt->video.p_palette );
fmt->video.p_palette = 0;
} }
#endif #endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ogg.c : ogg stream demux module for vlc * ogg.c : ogg stream demux module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2003 VideoLAN * Copyright (C) 2001-2003 VideoLAN
* $Id: ogg.c,v 1.55 2004/02/07 00:16:34 gbazin Exp $ * $Id: ogg.c,v 1.56 2004/02/07 00:33:08 gbazin Exp $
* *
* Author: Gildas Bazin <gbazin@netcourrier.com> * Author: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -1111,7 +1111,7 @@ static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg ) ...@@ -1111,7 +1111,7 @@ static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg )
if( p_ogg->pp_stream[i_stream]->p_packets_backup) if( p_ogg->pp_stream[i_stream]->p_packets_backup)
free( p_ogg->pp_stream[i_stream]->p_packets_backup ); free( p_ogg->pp_stream[i_stream]->p_packets_backup );
es_format_Free( &p_stream->fmt ); es_format_Clean( &p_stream->fmt );
free( p_ogg->pp_stream[i_stream] ); free( p_ogg->pp_stream[i_stream] );
} }
......
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