* modules/demux/mp4/libmp4.c: fixed (again) parsing of wave tag.
* libmp4.c : LibMP4 library for mp4 module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* libmp4.c : LibMP4 library for mp4 module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: libmp4.c,v 1.37 2003/12/02 13:31:23 gbazin Exp $
+ * $Id: libmp4.c,v 1.38 2003/12/15 22:55:01 gbazin Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
free( p_buff ); \
if( i_read < 0 ) \
{ \
free( p_buff ); \
if( i_read < 0 ) \
{ \
- msg_Warn( p_stream->p_input, "Not enougth data" ); \
+ msg_Warn( p_stream->p_input, "Not enough data" ); \
if( i_read < 28 )
{
i_read -= 30;
if( i_read < 28 )
{
i_read -= 30;
}
for( i = 0; i < 6 ; i++ )
}
for( i = 0; i < 6 ; i++ )
* mpeg4audio.c: parse and packetize an MPEG 4 audio stream
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* mpeg4audio.c: parse and packetize an MPEG 4 audio stream
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: mpeg4audio.c,v 1.12 2003/11/16 21:07:31 gbazin Exp $
+ * $Id: mpeg4audio.c,v 1.13 2003/12/15 22:55:01 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
if( !pp_block || !*pp_block ) return NULL;
p_block = *pp_block;
if( !pp_block || !*pp_block ) return NULL;
p_block = *pp_block;
+ *pp_block = NULL; /* Don't reuse this block */
if( !aout_DateGet( &p_sys->end_date ) && !p_block->i_pts )
{
if( !aout_DateGet( &p_sys->end_date ) && !p_block->i_pts )
{
p_block->i_length = aout_DateIncrement( &p_sys->end_date,
p_dec->fmt_out.audio.i_frame_length ) - p_block->i_pts;
p_block->i_length = aout_DateIncrement( &p_sys->end_date,
p_dec->fmt_out.audio.i_frame_length ) - p_block->i_pts;
}
/****************************************************************************
}
/****************************************************************************