* Win32 compilation fixes, esp. the MAC retrieval.

Makefile.opts.in

@@ -141,7 +141,7 @@ INCLUDE += -Iinclude -Iextras -I/usr/local/include
 LIB += @LIB@ -L/usr/local/lib
 
 ifneq (,$(findstring mingw32,$(SYS)))
-LIB += -lws2_32
+LIB += -lws2_32 -lnetapi32
 endif
 
 #

configure.in

@@ -149,9 +149,11 @@ dnl
 case x$host_os in
   xmingw32msvc)
     MMX_PLUGINS="idctmmx motionmmx"
+    MMXEXT_PLUGINS="idctmmxext motionmmxext imdct3dn"
     ;;
   *)
     MMX_PLUGINS="yuvmmx idctmmx motionmmx"
+    MMXEXT_PLUGINS="idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
     ;;
 esac
 
@@ -162,7 +164,7 @@ AC_TRY_COMPILE([void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],,
 
 AC_MSG_CHECKING([if \$CC groks MMX EXT or SSE inline assembly])
 AC_TRY_COMPILE([void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}],,
-  ACCEL_PLUGINS="${ACCEL_PLUGINS} idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
+  ACCEL_PLUGINS="${ACCEL_PLUGINS} ${MMXEXT_PLUGINS}"
   AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl

include/netutils.h

@@ -4,7 +4,7 @@
  * modules.
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: netutils.h,v 1.12 2001/05/06 04:32:02 sam Exp $
+ * $Id: netutils.h,v 1.13 2001/05/28 02:38:48 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Henri Fallon <henri@videolan.org>
@@ -32,5 +32,5 @@
  *****************************************************************************/
 int network_BuildLocalAddr ( struct sockaddr_in *, int, char * ); 
 int network_BuildRemoteAddr( struct sockaddr_in *, char * );
-int network_ChannelJoin    ( int i_channel_id );
+int network_ChannelJoin    ( int );
 int network_ChannelCreate  ( void );

plugins/imdct/ac3_imdct_3dn.c

@@ -2,7 +2,7 @@
  * ac3_imdct_3dn.c: accelerated 3D Now! ac3 DCT
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: ac3_imdct_3dn.c,v 1.1 2001/05/16 14:51:29 reno Exp $
+ * $Id: ac3_imdct_3dn.c,v 1.2 2001/05/28 02:38:48 sam Exp $
  *
  * Authors: Renaud Dartus <reno@videolan.org>
  *
@@ -41,6 +41,10 @@
 #include "ac3_imdct_common.h"
 #include "ac3_retables.h"
 
+#ifndef M_PI
+#   define M_PI 3.14159265358979323846
+#endif
+
 void _M( fft_64p )  ( complex_t *x );
 void _M( fft_128p ) ( complex_t *a );
 

plugins/imdct/ac3_imdct_sse.c

@@ -2,7 +2,7 @@
  * ac3_imdct_sse.c: accelerated SSE ac3 DCT
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: ac3_imdct_sse.c,v 1.2 2001/05/16 14:51:29 reno Exp $
+ * $Id: ac3_imdct_sse.c,v 1.3 2001/05/28 02:38:48 sam Exp $
  *
  * Authors: Renaud Dartus <reno@videolan.org>
  *          Aaron Holtzman <aholtzma@engr.uvic.ca>
@@ -42,6 +42,10 @@
 #include "ac3_imdct_common.h"
 #include "ac3_retables.h"
 
+#ifndef M_PI
+#   define M_PI 3.14159265358979323846
+#endif
+
 void _M( fft_64p )  ( complex_t *x );
 void _M( fft_128p ) ( complex_t *a );
 

plugins/imdct/imdct3dn.c

@@ -2,7 +2,7 @@
  * imdct3dn.c : accelerated 3D Now! IMDCT module
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: imdct3dn.c,v 1.1 2001/05/16 14:51:29 reno Exp $
+ * $Id: imdct3dn.c,v 1.2 2001/05/28 02:38:48 sam Exp $
  *
  * Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
  *
@@ -67,7 +67,7 @@ MODULE_CONFIG_END
 MODULE_INIT
 {
     p_module->psz_name = MODULE_STRING;
-    p_module->psz_longname = "AC3 IMDCT module";
+    p_module->psz_longname = "3D Now! AC3 IMDCT module";
     p_module->psz_version = VERSION;
 
     p_module->i_capabilities = MODULE_CAPABILITY_NULL

plugins/imdct/imdctsse.c

@@ -2,7 +2,7 @@
  * imdctsse.c : accelerated SSE IMDCT module
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: imdctsse.c,v 1.1 2001/05/15 16:19:42 sam Exp $
+ * $Id: imdctsse.c,v 1.2 2001/05/28 02:38:48 sam Exp $
  *
  * Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
  *
@@ -67,7 +67,7 @@ MODULE_CONFIG_END
 MODULE_INIT
 {
     p_module->psz_name = MODULE_STRING;
-    p_module->psz_longname = "AC3 IMDCT module";
+    p_module->psz_longname = "SSE AC3 IMDCT module";
     p_module->psz_version = VERSION;
 
     p_module->i_capabilities = MODULE_CAPABILITY_NULL