diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04a9efc6..c413c06a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,13 +153,15 @@ macro(check_ffmpeg_component_versions)
     endif()
 endmacro()
 
-set(FFMPEG_DEFAULT ON)
+if(((NOT DEFINED ENABLE_FFMPEG) AND (NOT (WIN32 AND X86))) OR ENABLE_FFMPEG)
+    set(FFMPEG_DEFAULT ON)
 
-find_package(FFmpeg COMPONENTS ${FFMPEG_COMPONENTS})
-check_ffmpeg_component_versions()
+    find_package(FFmpeg COMPONENTS ${FFMPEG_COMPONENTS})
+    check_ffmpeg_component_versions()
 
-if(NOT FFMPEG_FOUND)
-    set(FFMPEG_DEFAULT OFF)
+    if(NOT FFMPEG_FOUND)
+        set(FFMPEG_DEFAULT OFF)
+    endif()
 endif()
 
 option(ENABLE_FFMPEG "Enable ffmpeg A/V recording" ${FFMPEG_DEFAULT})
diff --git a/cmake/Architecture.cmake b/cmake/Architecture.cmake
index 60842355..677fc0f5 100644
--- a/cmake/Architecture.cmake
+++ b/cmake/Architecture.cmake
@@ -16,9 +16,11 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64")
     if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit
         set(ASM_DEFAULT ON)
         set(X86_32 ON)
+        set(X86 ON)
 	set(WINARCH x86)
     else()
         set(AMD64 ON)
+        set(X64 ON)
 	set(WINARCH x64)
     endif()