Index: configure
===================================================================
--- configure	(revision 14148)
+++ configure	(working copy)
@@ -2702,12 +2702,6 @@
         VENDOR_XVMC_LIBS="-lXvMCNVIDIA"
         enable xvmc
         disable xvmc_vld
-    elif enabled xvmc_pro; then
-        disable xvmc_pro
-        if has_library libviaXvMCPro ; then
-            VENDOR_XVMC_LIBS="-lviaXvMCPro"
-            enable xvmc xvmc_vld xvmc_pro
-        fi
     elif has_library libviaXvMC ; then
         VENDOR_XVMC_LIBS="-lviaXvMC"
         enable xvmc xvmc_vld
@@ -2716,6 +2710,15 @@
         enable xvmc
         disable xvmc_vld
     fi
+
+    if enabled xvmc_pro; then
+        disable xvmc_pro
+        if has_library libviaXvMCPro ; then
+            VENDOR_XVMC_LIBS="-lviaXvMCPro"
+            enable xvmc xvmc_vld xvmc_pro
+        fi
+    fi
+
 else
     disable xvmc_vld xvmc_opengl
 fi
@@ -2736,7 +2739,7 @@
     fi
 fi
 
-disabled xvmc_opengl || enable opengl && disable xvmc_vld xvmc_pro
+disabled xvmc_opengl || (enable opengl && disable xvmc_vld xvmc_pro)
 disabled opengl_video || enable opengl
 has_library libGL || disable opengl_video xvmc_opengl opengl_vsync opengl