* INSTALL.win32: added an instruction for using tar to extract the contrib.

* modules/stream_out/transcode.c: added mp3 fourcc.

diff --git a/INSTALL.win32 b/INSTALL.win32
index 812ce052518e01eae1739082c825de323952ef77..e4639f2a40d4533f9fbe17c238d057c6ccd27179 100644 (file)
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -1,4 +1,4 @@
-$Id: INSTALL.win32,v 1.16 2003/06/22 16:00:56 gbazin Exp $
+$Id: INSTALL.win32,v 1.17 2003/07/06 16:22:15 gbazin Exp $
 
 INSTALL file for the Windows9x/Me/NT4/2k/XP version of the VLC media player
 
@@ -93,7 +93,8 @@ actually really easy to compile a full-featured version of vlc (these compiled
 libraries will only work with mingw or cygwin):
 http://www.videolan.org/pub/testing/win32/contrib-20030622-win32-bin.tar.bz2
 All you need to do is extract it in your root directory (the include files
-and libraries will be put in /usr/win32)
+and libraries will be put in /usr/win32). You can do this with the following
+command: "tar xjvf contrib-20030622-win32-bin.tar.bz2 -C /"
 
 A complete list of the libraries on which we depend can be found here:
 http://developers.videolan.org/vlc/

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 9015773ee4debbda27c47379626d62a683f27406..f22b262541b9567d245fe98c321300e8bd00602b 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -2,7 +2,7 @@
  * transcode.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: transcode.c,v 1.22 2003/07/04 16:35:20 sam Exp $
+ * $Id: transcode.c,v 1.23 2003/07/06 16:22:15 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -479,6 +479,7 @@ static struct
 {
     /* audio */
     { VLC_FOURCC( 'm', 'p', 'g', 'a' ), CODEC_ID_MP2 },
+    { VLC_FOURCC( 'm', 'p', '3', ' ' ), CODEC_ID_MP3LAME },
     { VLC_FOURCC( 'a', '5', '2', ' ' ), CODEC_ID_AC3 },
     { VLC_FOURCC( 'a', 'c', '3', ' ' ), CODEC_ID_AC3 },
     { VLC_FOURCC( 'w', 'm', 'a', '1' ), CODEC_ID_WMAV1 },