diff --git a/src/osgDB/CMakeLists.txt b/src/osgDB/CMakeLists.txt
index 03bcd2c93..340aae095 100644
--- a/src/osgDB/CMakeLists.txt
+++ b/src/osgDB/CMakeLists.txt
@@ -147,8 +147,8 @@ IF(AV_FOUNDATION_FOUND)
     ADD_DEFINITIONS(-DUSE_AV_FOUNDATION)
 ENDIF()
 
-IF(XINE_FOUND)
-    ADD_DEFINITIONS(-DUSE_XINE)
+IF(FFMPEG_FOUND)
+    ADD_DEFINITIONS(-DUSE_FFMPEG)
 ENDIF()
 
 IF(INVENTOR_FOUND)
diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp
index 3e9319eff..2262e9dae 100644
--- a/src/osgDB/Registry.cpp
+++ b/src/osgDB/Registry.cpp
@@ -380,16 +380,16 @@ Registry::Registry()
     addFileExtensionAlias("tif",  "tiff");
 
     // really need to decide this at runtime...
-    #if defined(USE_XINE)
+    #if defined(USE_FFMPEG)
 
-        addFileExtensionAlias("mov",  "xine");
-        addFileExtensionAlias("mpg",  "xine");
-        addFileExtensionAlias("ogv",  "xine");
-        addFileExtensionAlias("mpv",  "xine");
-        addFileExtensionAlias("dv",   "xine");
-        addFileExtensionAlias("avi",  "xine");
-        addFileExtensionAlias("wmv",  "xine");
-        addFileExtensionAlias("flv",  "xine");
+        addFileExtensionAlias("mov",  "ffmpeg");
+        addFileExtensionAlias("mpg",  "ffmpeg");
+        addFileExtensionAlias("ogv",  "ffmpeg");
+        addFileExtensionAlias("mpv",  "ffmpeg");
+        addFileExtensionAlias("dv",   "ffmpeg");
+        addFileExtensionAlias("avi",  "ffmpeg");
+        addFileExtensionAlias("wmv",  "ffmpeg");
+        addFileExtensionAlias("flv",  "ffmpeg");
     #endif
 
     // support QuickTime for Windows