Remove useless test before a free (again).

[vlc] / modules / demux / nsc.c

diff --git a/modules/demux/nsc.c b/modules/demux/nsc.c
index 7e5c934091993b0c946cd0ac5529d44d4f4fa40b..d6561d3547a749371af88a216ffb693040880988 100644 (file)
--- a/modules/demux/nsc.c
+++ b/modules/demux/nsc.c
@@ -25,6 +25,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
 #include <vlc_playlist.h>
@@ -42,7 +46,7 @@ vlc_module_begin();
     set_description( _("Windows Media NSC metademux") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 2 );
+    set_capability( "demux2", 3 );
     set_callbacks( DemuxOpen, DemuxClose );
 vlc_module_end();
 
@@ -264,7 +268,7 @@ static char *nscdec( vlc_object_t *p_demux, char* p_encoded )
 static int DemuxOpen( vlc_object_t * p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
-    byte_t *p_peek;
+    const byte_t *p_peek;
     int i_size;
 
     /* Lets check the content to see if this is a NSC file */
@@ -318,7 +322,7 @@ static int ParseLine ( demux_t *p_demux, char *psz_line )
     }
     *psz_value = '\0';
     psz_value++;
-    
+ 
     if( !strncasecmp( psz_value, "0x", 2 ) )
     {
         int i_value;
@@ -337,7 +341,7 @@ static int ParseLine ( demux_t *p_demux, char *psz_line )
         if( psz_out )
         {
             msg_Dbg( p_demux, "%s = %s", psz_bol, psz_out );
-            if( psz_out) free( psz_out );
+            free( psz_out );
         }
     }
     return VLC_SUCCESS;
@@ -355,7 +359,7 @@ static int Demux ( demux_t *p_demux )
     while( ( psz_line = stream_ReadLine( p_demux->s ) ) )
     {
         ParseLine( p_demux, psz_line );
-        if( psz_line ) free( psz_line );
+        free( psz_line );
     }
     return VLC_SUCCESS;
 }