Commit afe6ac24 authored by Laurent Aimar's avatar Laurent Aimar

* Modules.am : added aac.c and wav.c

 * asf/asf.c: better check for invalid header.
parent 5aa4f283
...@@ -5,4 +5,6 @@ SOURCES_m3u = m3u.c ...@@ -5,4 +5,6 @@ SOURCES_m3u = m3u.c
SOURCES_demuxdump = demuxdump.c SOURCES_demuxdump = demuxdump.c
SOURCES_rawdv = rawdv.c SOURCES_rawdv = rawdv.c
SOURCES_au = au.c SOURCES_au = au.c
SOURCES_wav = wav.c
SOURCES_aac = aac.c
SOURCES_mkv = mkv.cpp SOURCES_mkv = mkv.cpp
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* asf.c : ASFv01 file input module for vlc * asf.c : ASFv01 file input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: asf.c,v 1.29 2003/05/22 21:42:43 gbazin Exp $ * $Id: asf.c,v 1.30 2003/08/01 00:16:37 fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -280,16 +280,12 @@ static int Activate( vlc_object_t * p_this ) ...@@ -280,16 +280,12 @@ static int Activate( vlc_object_t * p_this )
p_wf->nBlockAlign = GetWLE( p_data + 12 ); p_wf->nBlockAlign = GetWLE( p_data + 12 );
p_wf->wBitsPerSample = GetWLE( p_data + 14 ); p_wf->wBitsPerSample = GetWLE( p_data + 14 );
input_AddInfo( p_cat, _("Bits Per Sample"), "%d", p_wf->wBitsPerSample ); input_AddInfo( p_cat, _("Bits Per Sample"), "%d", p_wf->wBitsPerSample );
p_wf->cbSize = __MAX( 0, p_wf->cbSize = __MIN( GetWLE( p_data + 16 ), i_size - sizeof( WAVEFORMATEX ));
i_size - sizeof( WAVEFORMATEX )); if( p_wf->cbSize > 0 )
if( i_size > sizeof( WAVEFORMATEX ) )
{ {
memcpy( (uint8_t*)p_wf + sizeof( WAVEFORMATEX ), memcpy( &p_wf[1], p_data + sizeof( WAVEFORMATEX ), p_wf->cbSize );
p_data + sizeof( WAVEFORMATEX ),
i_size - sizeof( WAVEFORMATEX ) );
} }
} }
} }
else else
if( CmpGUID( &p_sp->i_stream_type, &asf_object_stream_type_video ) ) if( CmpGUID( &p_sp->i_stream_type, &asf_object_stream_type_video ) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment