--- xvid.c	2008/11/26 01:04:34	1.75
+++ xvid.c	2008/11/30 16:38:31	1.77.2.2
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: xvid.c,v 1.75 2008/11/26 01:04:34 Isibaar Exp $
+ * $Id: xvid.c,v 1.77.2.2 2008/11/30 16:38:31 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -542,7 +542,7 @@
 
 		/* DCT operators */
 		fdct = fdct_sse2_skal;
-                idct = idct_sse2_skal;   /* Is now IEEE1180 and Walken compliant. */
+		idct = idct_sse2_skal;   /* Is now IEEE1180 and Walken compliant. */
 
 		/* postprocessing */
 		image_brightness = image_brightness_sse2;
@@ -661,21 +661,18 @@
 		return XVID_ERR_VERSION;
 
 	info->actual_version = XVID_VERSION;
-	info->build = "xvid-1.2.0-dev";
+	info->build = "xvid-1.2.0";
 	info->cpu_flags = detect_cpu_flags();
-  info->num_threads = 0;
+	info->num_threads = 0;
 
 #if defined(_WIN32)
+
   {
-    DWORD dwProcessAffinityMask, dwSystemAffinityMask;
-    if (GetProcessAffinityMask(GetCurrentProcess(), (PDWORD_PTR) &dwProcessAffinityMask, (PDWORD_PTR) &dwSystemAffinityMask)) {
-      int i;      
-      for(i=0; i<32; i++) {
-        if ((dwProcessAffinityMask & (1<<i)))
-          info->num_threads++;
-      }
-    }
+	SYSTEM_INFO siSysInfo;
+	GetSystemInfo(&siSysInfo);
+	info->num_threads = siSysInfo.dwNumberOfProcessors; /* number of _logical_ cores */
   }
+
 #else
 
   #include <unistd.h>