/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <ctype.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_demux.h>
#include <vlc_playlist.h>
+#include <ctype.h>
#define MAX_LINE 16024
/*****************************************************************************
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();
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;
}
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 );
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;
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 */
}
*psz_value = '\0';
psz_value++;
-
+
if( !strncasecmp( psz_value, "0x", 2 ) )
{
int i_value;
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;
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;
}