[vlc-devel] commit: Remove unnecessary check for p_sys->b_es_osd in transcode_osd_close () (Jean-Paul Saman )

git version control git at videolan.org
Sat May 31 15:45:44 CEST 2008


vlc | branch: 0.8.6-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Sat May 31 15:35:48 2008 +0200| [aa0ac4814513915c37149cfbdefbee908e2883bb]

Remove unnecessary check for p_sys->b_es_osd in transcode_osd_close()

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

 modules/stream_out/transcode.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index f9dc400..b7208dd 100644
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -2,7 +2,7 @@
  * transcode.c: transcoding stream output module
  *****************************************************************************
  * Copyright (C) 2003-2004 the VideoLAN team
- * $Id$
+ * $Id: f9dc400b8ad7bfcfce8fb34629b588353d176a3b $
  *
  * Authors: Laurent Aimar <fenrir at via.ecp.fr>
  *          Gildas Bazin <gbazin at videolan.org>
@@ -2790,7 +2790,7 @@ static void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_t *id)
     sout_stream_sys_t *p_sys = p_stream->p_sys;
 
     /* Close encoder */
-    if( p_sys->b_es_osd && id )
+    if( id )
     {
         if( id->p_encoder->p_module )
             module_Unneed( id->p_encoder, id->p_encoder->p_module );
@@ -2804,7 +2804,7 @@ static void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_t *id)
         }
     }
     p_sys->b_es_osd = VLC_FALSE;
-    if( id ) free( id );
+    free( id );
 }
 
 static int transcode_osd_process( sout_stream_t *p_stream,




More information about the vlc-devel mailing list