diff -r -u HandBrake/contrib/libmp4v2/mpeg4ip_config-linux.h HandBrake_patched/contrib/libmp4v2/mpeg4ip_config-linux.h
--- HandBrake/contrib/libmp4v2/mpeg4ip_config-linux.h	2004-10-26 17:51:52.000000000 +0200
+++ HandBrake_patched/contrib/libmp4v2/mpeg4ip_config-linux.h	2005-06-29 22:15:49.000000000 +0200
@@ -167,7 +167,7 @@
 #define PACKAGE_VERSION ""
 
 /* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
+#define SIZEOF_LONG 8
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
diff -r -u HandBrake/contrib/libsamplerate/config.h HandBrake_patched/contrib/libsamplerate/config.h
--- HandBrake/contrib/libsamplerate/config.h	2004-08-12 15:10:11.000000000 +0200
+++ HandBrake_patched/contrib/libsamplerate/config.h	2005-06-29 22:16:31.000000000 +0200
@@ -1,8 +1,17 @@
 #define PACKAGE "libsamplerate"
 #define VERSION "0.1.1"
 #define SIZEOF_INT 4
+
+#ifdef HB_AMD64
+#define SIZEOF_LONG 8
+#else
 #define SIZEOF_LONG 4
+#endif
 
+#ifdef HB_AMD64
+#define CPU_CLIPS_NEGATIVE 1
+#define CPU_CLIPS_POSITIVE 0
+#endif
 #ifdef HB_X86
 #define CPU_CLIPS_NEGATIVE 1
 #define CPU_CLIPS_POSITIVE 0