--- trunk/xvidextra/src/installer/xvid.xml	2017/01/25 20:39:08	2152
+++ trunk/xvidextra/src/installer/xvid.xml	2017/01/25 20:40:54	2153
@@ -1866,23 +1866,10 @@
         <removeDirectoryFromPath>
             <path>${installdir}\xvid-gstreamer\0.10\x86\bin</path>
         </removeDirectoryFromPath>
-    </preUninstallationActionList>
-    <postUninstallationActionList>
-        <registryDelete>
-            <abortOnError>0</abortOnError>
-            <key>HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run</key>
-            <name>Xvid</name>
-            <showMessageOnError>0</showMessageOnError>
-            <ruleList>
-                <platformTest>
-                    <type>windows</type>
-                </platformTest>
-            </ruleList>
-        </registryDelete>
         <registrySet>
             <abortOnError>0</abortOnError>
-            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc\58564944</key>
-            <name>Description</name>
+            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
+            <name>58564944</name>
             <showMessageOnError>0</showMessageOnError>
             <type>REG_DWORD</type>
             <value>5634504d</value>
@@ -1890,8 +1877,8 @@
         </registrySet>
         <registrySet>
             <abortOnError>0</abortOnError>
-            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc\78766964</key>
-            <name>Description</name>
+            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
+            <name>78766964</name>
             <showMessageOnError>0</showMessageOnError>
             <type>REG_DWORD</type>
             <value>5634504d</value>
@@ -1899,8 +1886,8 @@
         </registrySet>
         <registrySet>
             <abortOnError>0</abortOnError>
-            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc\58564944</key>
-            <name>Description</name>
+            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
+            <name>58564944</name>
             <showMessageOnError>0</showMessageOnError>
             <type>REG_DWORD</type>
             <value>5634504d</value>
@@ -1908,13 +1895,26 @@
         </registrySet>
         <registrySet>
             <abortOnError>0</abortOnError>
-            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc\78766964</key>
-            <name>Description</name>
+            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
+            <name>78766964</name>
             <showMessageOnError>0</showMessageOnError>
             <type>REG_DWORD</type>
             <value>5634504d</value>
             <wowMode>64</wowMode>
         </registrySet>
+    </preUninstallationActionList>
+    <postUninstallationActionList>
+        <registryDelete>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run</key>
+            <name>Xvid</name>
+            <showMessageOnError>0</showMessageOnError>
+            <ruleList>
+                <platformTest>
+                    <type>windows</type>
+                </platformTest>
+            </ruleList>
+        </registryDelete>
         <deleteFile>
             <abortOnError>0</abortOnError>
             <path>${windows_folder_common_programs}/${product_shortname}</path>