/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
/* TODO:
static void Close ( vlc_object_t * );
vlc_module_begin();
- set_description( _("NullSoft demuxer" ) );
- set_capability( "demux2", 10 );
+ set_description( N_("NullSoft demuxer" ) );
+ set_capability( "demux", 10 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
set_callbacks( Open, Close );
if( memcmp( p_peek, "NSVf", 4 ) && memcmp( p_peek, "NSVs", 4 ) )
{
/* In case we had force this demuxer we try to resynch */
- if( strcmp( p_demux->psz_demux, "nsv" ) || ReSynch( p_demux ) )
- {
+ if( !p_demux->b_force || ReSynch( p_demux ) )
return VLC_EGENERIC;
- }
}
/* Fill p_demux field */
case VLC_FOURCC( 'V', 'P', '6', '0' ):
case VLC_FOURCC( 'V', 'P', '6', '1' ):
case VLC_FOURCC( 'V', 'P', '6', '2' ):
+ case VLC_FOURCC( 'H', '2', '6', '4' ):
case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
break;
default: