--- trunk/xvidextra/src/installer/xvid.xml	2011/05/19 19:17:56	2007
+++ trunk/xvidextra/src/installer/xvid.xml	2011/05/20 09:09:49	2008
@@ -529,26 +529,6 @@
                 </platformTest>
             </ruleList>
         </runProgram>
-        <deleteFile>
-            <abortOnError>0</abortOnError>
-            <path>${system_temp_directory}/xvid_x64</path>
-            <showMessageOnError>0</showMessageOnError>
-            <ruleList>
-                <platformTest>
-                    <type>windows</type>
-                </platformTest>
-            </ruleList>
-        </deleteFile>
-        <deleteFile>
-            <abortOnError>0</abortOnError>
-            <path>${system_temp_directory}/xvid_x86</path>
-            <showMessageOnError>0</showMessageOnError>
-            <ruleList>
-                <platformTest>
-                    <type>windows</type>
-                </platformTest>
-            </ruleList>
-        </deleteFile>
         <registrySet>
             <key>HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run</key>
             <name>Xvid</name>
@@ -704,6 +684,89 @@
                 </quickLaunchShortcut>
             </shortcutList>
         </createShortcuts>
+        <registryDelete>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_CLASSES_ROOT\Media Type\Extensions\.avi</key>
+            <name></name>
+            <showMessageOnError>0</showMessageOnError>
+            <wowMode>64</wowMode>
+            <ruleList>
+                <platformTest>
+                    <type>windows-x64</type>
+                </platformTest>
+            </ruleList>
+        </registryDelete>
+        <registryDelete>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_CLASSES_ROOT\Media Type\Extensions\.avi</key>
+            <name></name>
+            <showMessageOnError>0</showMessageOnError>
+            <wowMode>32</wowMode>
+        </registryDelete>
+        <registrySet>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_CLASSES_ROOT\Media Type\Extensions\.avi</key>
+            <name></name>
+            <showMessageOnError>0</showMessageOnError>
+            <type>REG_NONE</type>
+            <value></value>
+            <wowMode>64</wowMode>
+            <ruleList>
+                <platformTest>
+                    <type>windows-x64</type>
+                </platformTest>
+            </ruleList>
+        </registrySet>
+        <registrySet>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_CLASSES_ROOT\Media Type\Extensions\.avi</key>
+            <name></name>
+            <showMessageOnError>0</showMessageOnError>
+            <type>REG_NONE</type>
+            <value></value>
+            <wowMode>32</wowMode>
+        </registrySet>
+        <runProgram>
+            <abortOnError>0</abortOnError>
+            <program>${system_temp_directory}/xvid_x86/setavi32.exe</program>
+            <programArguments></programArguments>
+            <show>0</show>
+            <showMessageOnError>0</showMessageOnError>
+            <workingDirectory>${system_temp_directory}/xvid_x86</workingDirectory>
+        </runProgram>
+        <runProgram>
+            <abortOnError>0</abortOnError>
+            <program>${system_temp_directory}/xvid_x64/setavi64.exe</program>
+            <programArguments></programArguments>
+            <show>0</show>
+            <showMessageOnError>0</showMessageOnError>
+            <workingDirectory>${system_temp_directory}/xvid_x64</workingDirectory>
+            <ruleList>
+                <platformTest>
+                    <type>windows-x64</type>
+                </platformTest>
+            </ruleList>
+        </runProgram>
+        <deleteFile>
+            <abortOnError>0</abortOnError>
+            <path>${system_temp_directory}/xvid_x64</path>
+            <showMessageOnError>0</showMessageOnError>
+            <ruleList>
+                <platformTest>
+                    <type>windows</type>
+                </platformTest>
+            </ruleList>
+        </deleteFile>
+        <deleteFile>
+            <abortOnError>0</abortOnError>
+            <path>${system_temp_directory}/xvid_x86</path>
+            <showMessageOnError>0</showMessageOnError>
+            <ruleList>
+                <platformTest>
+                    <type>windows</type>
+                </platformTest>
+            </ruleList>
+        </deleteFile>
     </postInstallationActionList>
     <preUninstallationActionList>
         <runProgram>
@@ -1085,6 +1148,9 @@
                         <distributionFile>
                             <origin>../../../xvidcore/dshow/bin/xvid_mft.ax</origin>
                         </distributionFile>
+                        <distributionFile>
+                            <origin>setavi32.exe</origin>
+                        </distributionFile>
                     </distributionFileList>
                 </folder>
                 <folder>
@@ -1111,6 +1177,9 @@
                         <distributionFile>
                             <origin>../../../xvidcore/dshow/bin/x64/xvid_mft.ax</origin>
                         </distributionFile>
+                        <distributionFile>
+                            <origin>setavi64.exe</origin>
+                        </distributionFile>
                     </distributionFileList>
                     <ruleList>
                         <platformTest type="windows-x64"/>