* modules/packetizer/h264.c: fixed insertion of SPS/PPS.

[vlc] / vlc.win32.nsi.in

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index b342b79c858e88c6a30ca36cc35fb2eeb6122144..59aaedd3c05f57fc2692f04675c05b2a28cb817c 100644 (file)
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -13,6 +13,8 @@
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
 !define PRODUCT_ID "{ea92ef52-afe4-4212-bacb-dfe9fca94cd6}"\r
 \r
+@FILE_LIBVLC_DLL@\r
+\r
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
 ; General configuration ;\r
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
@@ -31,7 +33,8 @@ SetCompressor /SOLID lzma
 SetOverwrite ifnewer\r
 CRCCheck on\r
 \r
-InstType "Normal"\r
+InstType "Recommended"\r
+InstType "Minimum"\r
 InstType "Full"\r
 \r
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
@@ -194,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
@@ -235,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
@@ -256,6 +259,16 @@ FunctionEnd
 \r
 Var UninstallLog\r
 \r
+!macro OpenUninstallLog\r
+  FileOpen $UninstallLog "$INSTDIR\uninstall.log" a\r
+  FileSeek $UninstallLog 0 END\r
+!macroend\r
+\r
+!macro CloseUninstallLog\r
+  FileClose $UninstallLog\r
+  SetFileAttributes "$INSTDIR\uninstall.log" HIDDEN\r
+!macroend\r
+\r
 !macro InstallFile FILEREGEX\r
   File "${FILEREGEX}"\r
   !define Index 'Line${__LINE__}'\r
@@ -312,12 +325,13 @@ Section "Media player (required)" SEC01
   SetShellVarContext all\r
   SetOutPath "$INSTDIR"\r
 \r
-  FileOpen $UninstallLog "$INSTDIR\uninstall.log" w\r
-  FileSeek $UninstallLog 0 END\r
+  !insertmacro OpenUninstallLog\r
 \r
   !insertmacro InstallFile vlc.exe\r
   !insertmacro InstallFile vlc.exe.manifest\r
-  @FILE_LIBVLC_DLL@\r
+  !ifdef LIBVLC_DLL\r
+  !insertmacro InstallFile ${LIBVLC_DLL}\r
+  !endif\r
   !insertmacro InstallFile *.txt\r
 \r
   !insertmacro InstallFolder plugins\r
@@ -333,8 +347,7 @@ Section "Media player (required)" SEC01
     "${PRODUCT_WEB_SITE}/doc/"\r
   FileWrite $UninstallLog "Documentation.url$\r$\n"\r
 \r
-  FileClose $UninstallLog\r
-  SetFileAttributes "$INSTDIR\uninstall.log" HIDDEN\r
+  !insertmacro CloseUninstallLog\r
 \r
   ; Add VLC to "recomended programs" for the following extensions\r
   WriteRegStr HKCR Applications\vlc.exe "" ""\r
@@ -397,12 +410,15 @@ SectionEnd
 Section "Desktop Shortcut" SEC02b\r
   SectionIn 1 2 3\r
   CreateShortCut "$DESKTOP\VLC media player.lnk" \\r
-    "$INSTDIR\vlc.exe" "--intf wx"\r
+    "$INSTDIR\vlc.exe" ""\r
 SectionEnd\r
 \r
 Section /o "Mozilla plugin" SEC03\r
-  SectionIn 2 3\r
-  File /r mozilla\r
+  SectionIn 1 3\r
+\r
+  !insertmacro OpenUninstallLog\r
+  !insertmacro InstallFolder mozilla\r
+  !insertmacro CloseUninstallLog\r
 \r
   ; doesn't work. bug in mozilla/mozilla firefox or moz documentation (xpt file isn't loaded)\r
   ; see mozilla bugs 184506 and 159445\r
@@ -431,6 +447,9 @@ Section /o "Mozilla plugin" SEC03
     StrCmp $R2 "" "${Index}-Loop" ""\r
 \r
     CopyFiles "$INSTDIR\mozilla\*" "$R2"\r
+    !ifdef LIBVLC_DLL\r
+    CopyFiles ${LIBVLC_DLL} "$R2"\r
+    !endif\r
     Goto "${Index}-Loop"\r
 \r
   "${Index}-End:"\r
@@ -438,15 +457,17 @@ Section /o "Mozilla plugin" SEC03
 \r
 SectionEnd\r
 \r
-Section "ActiveX plugin" SEC04\r
-  SectionIn 2 3\r
+Section /o "ActiveX plugin" SEC04\r
+  SectionIn 1 3\r
   SetOutPath "$INSTDIR"\r
-  File activex\axvlc.dll\r
+  !insertmacro OpenUninstallLog\r
+  !insertmacro InstallFile activex\axvlc.dll\r
+  !insertmacro CloseUninstallLog\r
   RegDLL "$INSTDIR\axvlc.dll"\r
 SectionEnd\r
 \r
-Section "Context Menus" SEC05\r
-  SectionIn 2 3\r
+Section /o "Context Menus" SEC05\r
+  SectionIn 3\r
   !insertmacro MacroAllExtensions AddContextMenu\r
   !insertmacro AddContextMenu "Directory"\r
 SectionEnd\r
@@ -663,6 +684,7 @@ Section "Uninstall" SEC91
 SectionEnd\r
 \r
 Section /o "un.Delete preferences and cache" SEC92\r
+  SectionIn 1 3\r
   !insertmacro delprefs\r
 SectionEnd\r
 \r