/*****************************************************************************
* nsv.c: NullSoft Video demuxer.
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id: nsv.c,v 1.9 2004/02/15 16:59:18 fenrir Exp $
+ * Copyright (C) 2004 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
vlc_module_begin();
set_description( _("NullSoft demuxer" ) );
set_capability( "demux2", 10 );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
set_callbacks( Open, Close );
add_shortcut( "nsv" );
vlc_module_end();
demux_sys_t *p_sys;
uint8_t *p_peek;
- int i;
if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 )
- {
- msg_Err( p_demux, "cannot peek" );
return VLC_EGENERIC;
- }
- if( strncmp( p_peek, "NSVf", 4 ) && strncmp( p_peek, "NSVs", 4 ))
+
+ if( strncmp( (char *)p_peek, "NSVf", 4 )
+ && strncmp( (char *)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 ) )
{
- msg_Warn( p_demux, "NSV module discarded" );
return VLC_EGENERIC;
}
}
return 0;
}
- if( !strncmp( p_peek, "NSVf", 4 ) )
+ if( !strncmp( (char *)p_peek, "NSVf", 4 ) )
{
if( ReadNSVf( p_demux ) )
{
return -1;
}
}
- else if( !strncmp( p_peek, "NSVs", 4 ) )
+ else if( !strncmp( (char *)p_peek, "NSVs", 4 ) )
{
if( ReadNSVs( p_demux ) )
{
*pi64 = 0;
return VLC_EGENERIC;
- case DEMUX_SET_TIME:
#endif
case DEMUX_GET_FPS:
pf = (double*)va_arg( args, double * );
*pf = (double)1000000.0 / (double)p_sys->i_pcr_inc;
return VLC_SUCCESS;
+ case DEMUX_SET_TIME:
default:
return VLC_EGENERIC;
}
*****************************************************************************/
static int ReSynch( demux_t *p_demux )
{
- uint8_t *p_peek;
+ uint8_t *p_peek;
int i_skip;
int i_peek;
while( i_skip < i_peek - 4 )
{
- if( !strncmp( p_peek, "NSVf", 4 ) || !strncmp( p_peek, "NSVs", 4 ) )
+ if( !strncmp( (char *)p_peek, "NSVf", 4 )
+ || !strncmp( (char *)p_peek, "NSVs", 4 ) )
{
if( i_skip > 0 )
{
*****************************************************************************/
static int ReadNSVf( demux_t *p_demux )
{
- demux_sys_t *p_sys = p_demux->p_sys;
+ /* demux_sys_t *p_sys = p_demux->p_sys; */
uint8_t *p;
int i_size;
fcc = VLC_FOURCC( 'a', 'r', 'a', 'w' );
break;
case VLC_FOURCC( 'A', 'A', 'C', ' ' ):
+ case VLC_FOURCC( 'A', 'A', 'C', 'P' ):
fcc = VLC_FOURCC( 'm', 'p', '4', 'a' );
break;
case VLC_FOURCC( 'N', 'O', 'N', 'E' ):