Initial support for Secure Real-Time Protocol (RFC3711) - refs #321

[vlc] / modules / demux / nsc.c

diff --git a/modules/demux/nsc.c b/modules/demux/nsc.c
index fb61a8a5373d68e24b3296afb77d31ee0632a3a7..ca509f8e957d9f03ddd66a83634728754a1b1d77 100644 (file)
--- a/modules/demux/nsc.c
+++ b/modules/demux/nsc.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <ctype.h>
 #include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_demux.h>
 #include <vlc_playlist.h>
 
 #define MAX_LINE 16024
@@ -136,7 +136,7 @@ static int load_byte( unsigned char encoding_type,
     return 0;
 }
 
-char *nscdec( vlc_object_t *p_demux, char* p_encoded )
+static char *nscdec( vlc_object_t *p_demux, char* p_encoded )
 {
     unsigned int i;
     unsigned char tmp;
@@ -235,7 +235,7 @@ char *nscdec( vlc_object_t *p_demux, char* p_encoded )
     }
 
     conv = vlc_iconv_open( "UTF-8", "UTF-16LE" );
-    if( conv == (vlc_iconv_t)-1 )
+    if( conv == (vlc_iconv_t)(-1) )
     {
         msg_Err( p_demux, "iconv_open failed" );
         free( buf16 );
@@ -246,7 +246,7 @@ char *nscdec( vlc_object_t *p_demux, char* p_encoded )
     p_buf8 = buf8;
     p_buf16 = (const char *)buf16;
 
-    if( vlc_iconv( conv, &p_buf16, &buf16_size, &p_buf8, &buf8_size ) == 0 )
+    if( vlc_iconv( conv, &p_buf16, &buf16_size, &p_buf8, &buf8_size ) == (size_t)(-1) )
     {
         msg_Err( p_demux, "iconv failed" );
         return NULL;