Silly me

[vlc] / modules / demux / xa.c

diff --git a/modules/demux/xa.c b/modules/demux/xa.c
index b1807e7d5e416ea7f82a726a588cdcf1c8309cba..eac381af0af74eed7f2cdb465deda9084ee7f0c3 100644 (file)
--- a/modules/demux/xa.c
+++ b/modules/demux/xa.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * xa.c : xa file input module for vlc
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
  * Authors: Remi Denis-Courmont <rem # videolan.org>
@@ -18,7 +18,7 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -65,7 +65,7 @@ struct demux_sys_t
 
 typedef struct xa_header_t
 {
-    uint8_t  xa_id[4];
+    char     xa_id[4];
     uint32_t iSize;
 
     uint16_t wFormatTag;
@@ -107,10 +107,9 @@ static int Open( vlc_object_t * p_this )
     /* skip XA header -- cannot fail */
     stream_Read( p_demux->s, NULL, sizeof( p_xa ) );
 
-    es_format_Init( &p_sys->fmt, AUDIO_ES, 0 );
+    es_format_Init( &p_sys->fmt, AUDIO_ES, VLC_FOURCC('X','A','J',0) );
 
-    msg_Dbg( p_demux, "assuming EA ADPCM audio format" );
-    p_sys->fmt.i_codec = VLC_FOURCC('X','A','J',0);
+    msg_Dbg( p_demux, "assuming EA ADPCM audio codec" );
     p_sys->fmt.audio.i_rate = GetDWLE( &p_xa.nSamplesPerSec );
     p_sys->fmt.audio.i_bytes_per_frame = 15 * GetWLE( &p_xa.nChannels );
     p_sys->fmt.audio.i_frame_length = 28; /* 28 samples of 4 bits each */