diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h
index 9319ca937d..52b8e40132 100644
--- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h
+++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h
@@ -35,7 +35,7 @@ extern "C" {
 #include "gfx_util.h"
 
 
-#ifdef __x86_64
+#if 1
 #define USE_SWS_FOR_COLOR_SPACE_CONVERSION 1
 #else
 #define USE_SWS_FOR_COLOR_SPACE_CONVERSION 0
diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile
index 907a268aa3..ebac868479 100644
--- a/src/add-ons/media/plugins/ffmpeg/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/Jamfile
@@ -24,14 +24,14 @@ local sources =
 	gfx_util.cpp
 	;
 
-if $(TARGET_ARCH) != x86_64 {
-	sources +=
-		gfx_conv_mmx.cpp
-		yuvrgb_sse.nasm
-		yuvrgb_sse2.nasm
-		yuvrgb_ssse3.nasm
-	;
-}
+#if $(TARGET_ARCH) != x86_64 {
+#	sources +=
+#		gfx_conv_mmx.cpp
+#		yuvrgb_sse.nasm
+#		yuvrgb_sse2.nasm
+#		yuvrgb_ssse3.nasm
+#	;
+#}
 
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
diff --git a/src/add-ons/media/plugins/ffmpeg/gfx_util.cpp b/src/add-ons/media/plugins/ffmpeg/gfx_util.cpp
index f641744d34..9bb570dbed 100644
--- a/src/add-ons/media/plugins/ffmpeg/gfx_util.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/gfx_util.cpp
@@ -46,7 +46,7 @@ resolve_colorspace(color_space colorSpace, AVPixelFormat pixelFormat, int width,
 
 			if (pixelFormat == AV_PIX_FMT_YUV420P
 				|| pixelFormat == AV_PIX_FMT_YUVJ420P) {
-#ifndef __x86_64__
+#if 0
 				if (cpu.HasSSSE3() && width % 8 == 0 && height % 2 == 0) {
 					TRACE("resolve_colorspace: gfx_conv_yuv420p_rgba32_ssse3\n");
 					return gfx_conv_yuv420p_rgba32_ssse3;
@@ -65,7 +65,7 @@ resolve_colorspace(color_space colorSpace, AVPixelFormat pixelFormat, int width,
 
 			if (pixelFormat == AV_PIX_FMT_YUV422P
 				|| pixelFormat == AV_PIX_FMT_YUVJ422P) {
-#ifndef __x86_64__
+#if 0
 				if (cpu.HasSSSE3() && width % 8 == 0) {
 					TRACE("resolve_colorspace: gfx_conv_yuv422p_RGB32_ssse3\n");
 					return gfx_conv_yuv422p_rgba32_ssse3;
@@ -87,7 +87,7 @@ resolve_colorspace(color_space colorSpace, AVPixelFormat pixelFormat, int width,
 
 			// Packed Formats
 			if (pixelFormat == AV_PIX_FMT_YUYV422) {
-#ifndef __x86_64__
+#if 0
 				if (cpu.HasSSSE3() && width % 8 == 0) {
 					return gfx_conv_yuv422_rgba32_ssse3;
 				} else if (cpu.HasSSE2() && width % 8 == 0) {