X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fnsc.c;h=c889af9a8e3f321e2a127ec9fd2e043c24649e17;hb=b5277240aa78e2515cc4f32ca4b582160b2ee8d8;hp=d6561d3547a749371af88a216ffb693040880988;hpb=bcddfd6382fb71b0021008eb63f1bc4a1b1bae0e;p=vlc

diff --git a/modules/demux/nsc.c b/modules/demux/nsc.c
index d6561d3547..c889af9a8e 100644
--- a/modules/demux/nsc.c
+++ b/modules/demux/nsc.c
@@ -29,9 +29,9 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
-#include <vlc_playlist.h>
 
 #include <ctype.h>
 #define MAX_LINE 16024
@@ -43,10 +43,10 @@ static int  DemuxOpen  ( vlc_object_t * );
 static void DemuxClose ( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("Windows Media NSC metademux") );
+    set_description( N_("Windows Media NSC metademux") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 3 );
+    set_capability( "demux", 3 );
     set_callbacks( DemuxOpen, DemuxClose );
 vlc_module_end();
 
@@ -213,10 +213,7 @@ static char *nscdec( vlc_object_t *p_demux, char* p_encoded )
     buf16_size = length;
     buf16 = malloc( buf16_size );
     if( buf16 == NULL )
-    {
-        msg_Err( p_demux, "out of memory" );
         return NULL;
-    }
 
     for( i = 0; i < length; i++ )
     {
@@ -232,7 +229,6 @@ static char *nscdec( vlc_object_t *p_demux, char* p_encoded )
     buf8 = malloc( buf8_size + 1 );
     if( buf8 == NULL )
     {
-        msg_Err( p_demux, "out of memory" );
         free( buf16 );
         return NULL;
     }
@@ -268,7 +264,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;
-    const byte_t *p_peek;
+    const uint8_t *p_peek;
     int i_size;
 
     /* Lets check the content to see if this is a NSC file */