--- branches/release-1_3-branch/xvidextra/src/installer/xvid.xml	2017/01/25 20:39:08	2152
+++ branches/release-1_3-branch/xvidextra/src/installer/xvid.xml	2017/01/31 14:57:13	2158
@@ -1246,128 +1246,68 @@
                 <compareText logic="equals" text="${AutoUpdate}" value="yes"/>
             </ruleList>
         </registrySet>
-        <registryDelete>
+        <registrySet>
             <abortOnError>0</abortOnError>
             <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
             <name>58564944</name>
             <showMessageOnError>0</showMessageOnError>
+            <type>REG_DWORD</type>
+            <value>1482049860</value>
             <wowMode>64</wowMode>
             <ruleList>
                 <platformTest>
-                    <negate>1</negate>
-                    <type>windows-xp</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-vista</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-9x</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-2003</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-2000</type>
+                    <type>windows-7</type>
                 </platformTest>
                 <platformTest>
                     <type>windows-x64</type>
                 </platformTest>
             </ruleList>
-        </registryDelete>
-        <registryDelete>
+        </registrySet>
+        <registrySet>
             <abortOnError>0</abortOnError>
             <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
-            <name>78766964</name>
+            <name>58564944</name>
             <showMessageOnError>0</showMessageOnError>
-            <wowMode>64</wowMode>
+            <type>REG_DWORD</type>
+            <value>1482049860</value>
+            <wowMode>32</wowMode>
             <ruleList>
                 <platformTest>
-                    <negate>1</negate>
-                    <type>windows-xp</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-vista</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-9x</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-2003</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-2000</type>
-                </platformTest>
-                <platformTest>
-                    <type>windows-x64</type>
+                    <type>windows-7</type>
                 </platformTest>
             </ruleList>
-        </registryDelete>
-        <registryDelete>
+        </registrySet>
+        <registrySet>
             <abortOnError>0</abortOnError>
             <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
-            <name>58564944</name>
+            <name>78766964</name>
             <showMessageOnError>0</showMessageOnError>
-            <wowMode>32</wowMode>
+            <type>REG_DWORD</type>
+            <value>2021026148</value>
+            <wowMode>64</wowMode>
             <ruleList>
                 <platformTest>
-                    <negate>1</negate>
-                    <type>windows-xp</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-vista</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-9x</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-2003</type>
+                    <type>windows-7</type>
                 </platformTest>
                 <platformTest>
-                    <negate>1</negate>
-                    <type>windows-2000</type>
+                    <type>windows-x64</type>
                 </platformTest>
             </ruleList>
-        </registryDelete>
-        <registryDelete>
+        </registrySet>
+        <registrySet>
             <abortOnError>0</abortOnError>
             <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
             <name>78766964</name>
             <showMessageOnError>0</showMessageOnError>
+            <type>REG_DWORD</type>
+            <value>2021026148</value>
             <wowMode>32</wowMode>
             <ruleList>
                 <platformTest>
-                    <negate>1</negate>
-                    <type>windows-xp</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-vista</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-9x</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-2003</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
-                    <type>windows-2000</type>
+                    <type>windows-7</type>
                 </platformTest>
             </ruleList>
-        </registryDelete>
+        </registrySet>
         <registrySet>
             <abortOnError>0</abortOnError>
             <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\DirectShow\Preferred</key>
@@ -1618,6 +1558,132 @@
         </registrySet>
     </postInstallationActionList>
     <preUninstallationActionList>
+        <registrySet>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
+            <name>58564944</name>
+            <type>REG_DWORD</type>
+            <value>1446269005</value>
+            <wowMode>32</wowMode>
+            <ruleList>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+            </ruleList>
+        </registrySet>
+        <registrySet>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
+            <name>78766964</name>
+            <type>REG_DWORD</type>
+            <value>1446269005</value>
+            <wowMode>32</wowMode>
+            <ruleList>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
+                </platformTest>
+            </ruleList>
+        </registrySet>
+        <registrySet>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
+            <name>58564944</name>
+            <type>REG_DWORD</type>
+            <value>1446269005</value>
+            <wowMode>64</wowMode>
+            <ruleList>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <type>windows-x64</type>
+                </platformTest>
+            </ruleList>
+        </registrySet>
+        <registrySet>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
+            <name>78766964</name>
+            <type>REG_DWORD</type>
+            <value>1446269005</value>
+            <wowMode>64</wowMode>
+            <ruleList>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <type>windows-x64</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+            </ruleList>
+        </registrySet>
         <runProgram>
             <customErrorMessage>DirectShow filter (32-bit) unregister failed!</customErrorMessage>
             <program>${windows_folder_system}/regsvr32.exe</program>
@@ -1827,42 +1893,6 @@
                 </platformTest>
             </ruleList>
         </deleteFile>
-        <registrySet>
-            <abortOnError>0</abortOnError>
-            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
-            <name>58564944</name>
-            <showMessageOnError>0</showMessageOnError>
-            <type>REG_DWORD</type>
-            <value>5634504d</value>
-            <wowMode>32</wowMode>
-        </registrySet>
-        <registrySet>
-            <abortOnError>0</abortOnError>
-            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
-            <name>78766964</name>
-            <showMessageOnError>0</showMessageOnError>
-            <type>REG_DWORD</type>
-            <value>5634504d</value>
-            <wowMode>32</wowMode>
-        </registrySet>
-        <registrySet>
-            <abortOnError>0</abortOnError>
-            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Classes\MediaFoundation\MapVideo4cc</key>
-            <name>58564944</name>
-            <showMessageOnError>0</showMessageOnError>
-            <type>REG_DWORD</type>
-            <value>5634504d</value>
-            <wowMode>64</wowMode>
-        </registrySet>
-        <registrySet>
-            <abortOnError>0</abortOnError>
-            <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>