mux/avi.c: fixed a crash when trying to make audio only avi files.

[vlc] / vlc.win32.nsi.in

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index 37b81e506090cc16677eacdd07fb31ef64453a5b..01255516d1926bec7c390464072dc790610bd664 100644 (file)
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -33,9 +33,9 @@ SetCompressor /SOLID lzma
 SetOverwrite ifnewer\r
 CRCCheck on\r
 \r
+InstType "Recommended"\r
 InstType "Minimum"\r
 InstType "Full"\r
-InstType "Recommended"\r
 \r
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
 ; NSIS Modern User Interface configuration ;\r
@@ -174,7 +174,7 @@ Function RegisterExtension
 NoBackup:\r
   WriteRegStr HKCR "$R0" "" "VLC$R0"\r
   ReadRegStr $0 HKCR "VLC$R0" ""\r
-  WriteRegStr HKCR "VLC$R0" "" "VLC media file"\r
+  WriteRegStr HKCR "VLC$R0" "" "VLC media file ($R0)"\r
   WriteRegStr HKCR "VLC$R0\shell" "" "Play"\r
   WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '"$INSTDIR\vlc.exe" --one-instance-when-started-from-file "%1"'\r
   WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
@@ -197,7 +197,7 @@ FunctionEnd
 \r
 !macro RegisterExtensionSection EXT\r
   Section /o ${EXT}\r
-    SectionIn 2 3\r
+    SectionIn 1 3\r
     Push $R0\r
     StrCpy $R0 ${EXT}\r
     Call RegisterExtension\r
@@ -238,7 +238,7 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;\r
 \r
 !macro delprefs\r
-  SectionIn 2 3\r
+  SectionIn 1 3\r
   StrCpy $0 0\r
   !define Index 'Line${__LINE__}'\r
   "${Index}-Loop:"\r
@@ -394,11 +394,7 @@ Section "Start Menu Shortcut" SEC02a
   SectionIn 1 2 3\r
   CreateDirectory "$SMPROGRAMS\VideoLAN"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \\r
-    "$INSTDIR\vlc.exe" "--intf wx --wx-embed"\r
-  CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (alt).lnk" \\r
-    "$INSTDIR\vlc.exe" "--intf wx --no-wx-embed"\r
-  CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (skins).lnk" \\r
-    "$INSTDIR\vlc.exe" "--intf skins"\r
+    "$INSTDIR\vlc.exe" "" \r
   CreateShortCut "$SMPROGRAMS\VideoLAN\Reset VLC defaults and quit.lnk" \\r
     "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache --save-config vlc:quit "\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_NAME} Website.lnk" \\r
@@ -414,7 +410,7 @@ Section "Desktop Shortcut" SEC02b
 SectionEnd\r
 \r
 Section /o "Mozilla plugin" SEC03\r
-  SectionIn 2 3\r
+  SectionIn 1 3\r
 \r
   !insertmacro OpenUninstallLog\r
   !insertmacro InstallFolder mozilla\r
@@ -458,7 +454,7 @@ Section /o "Mozilla plugin" SEC03
 SectionEnd\r
 \r
 Section /o "ActiveX plugin" SEC04\r
-  SectionIn 2 3\r
+  SectionIn 1 3\r
   SetOutPath "$INSTDIR"\r
   !insertmacro OpenUninstallLog\r
   !insertmacro InstallFile activex\axvlc.dll\r
@@ -467,7 +463,7 @@ Section /o "ActiveX plugin" SEC04
 SectionEnd\r
 \r
 Section /o "Context Menus" SEC05\r
-  SectionIn 2\r
+  SectionIn 3\r
   !insertmacro MacroAllExtensions AddContextMenu\r
   !insertmacro AddContextMenu "Directory"\r
 SectionEnd\r
@@ -631,7 +627,6 @@ Section "Uninstall" SEC91
     ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins"\r
     StrCmp $R2 "" "${Index}-Loop" ""\r
 \r
-    Delete "$R2\vlcintf.xpt"\r
     Delete "$R2\npvlc.dll"\r
     Goto "${Index}-Loop"\r
 \r
@@ -684,7 +679,7 @@ Section "Uninstall" SEC91
 SectionEnd\r
 \r
 Section /o "un.Delete preferences and cache" SEC92\r
-  SectionIn 2 3\r
+  SectionIn 1 3\r
   !insertmacro delprefs\r
 SectionEnd\r
 \r