* modules/packetizer/mpeg4audio.c: fixed raw mpeg4 audio packetizer.

* modules/demux/mp4/libmp4.c: fixed (again) parsing of wave tag.

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 70863dfdbfd6c02ce5a503a64cd31f6b0c23499d..6b94aef0e80c284bf1f81b5097c3f38d2f9d9662 100644 (file)
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -2,7 +2,7 @@
  * 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
@@ -102,7 +102,7 @@
     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" ); \
     } \
     return( i_code )
 
@@ -1090,7 +1090,7 @@ static int MP4_ReadBox_sample_soun( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
     if( i_read < 28 )
     {
         i_read -= 30;
-        MP4_READBOX_EXIT( 0 );
+        MP4_READBOX_EXIT( 1 );
     }
 
     for( i = 0; i < 6 ; i++ )

diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c
index 6a1b5e694d2c26ed9704c8c7b808d7b0ef920658..0361e67fc430dc971e57c4e1b1876b287ab5a592 100644 (file)
--- a/modules/packetizer/mpeg4audio.c
+++ b/modules/packetizer/mpeg4audio.c
@@ -2,7 +2,7 @@
  * 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>
@@ -212,6 +212,7 @@ static block_t *PacketizeBlock( decoder_t *p_dec, block_t **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 )
     {
@@ -230,7 +231,7 @@ static block_t *PacketizeBlock( decoder_t *p_dec, block_t **pp_block )
     p_block->i_length = aout_DateIncrement( &p_sys->end_date,
         p_dec->fmt_out.audio.i_frame_length ) - p_block->i_pts;
 
-    return *pp_block;
+    return p_block;
 }
 
 /****************************************************************************