* modules/mux/ogg.c: each ogg stream has to be cleared in OggCreateHeader().

[vlc] / install-win32

diff --git a/install-win32 b/install-win32
index 9449c4c0d902b7e55858f36f9f327b60b429fefa..a79af678be9bb9ee3fca6374f5e8cfa3f7bd2cbf 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -62,10 +62,10 @@ Section "Install"
        File  vlc.exe\r
        File  *.txt\r
 \r
-       File  /r share\r
        File  /r plugins\r
        File  /r locale\r
        File  /r skins\r
+       File  /r http\r
 \r
         SetShellVarContext all\r
 \r
@@ -74,19 +74,17 @@ Section "Install"
                        "$INSTDIR\vlc.exe" "--intf wxwin"\r
        CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (skins).lnk" \\r
                        "$INSTDIR\vlc.exe" "--intf skins"\r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (custom).lnk" \\r
-                       "$INSTDIR\vlc.exe" \r
 \r
         WriteRegStr HKLM \\r
             SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \\r
-            "DisplayName" "VideoLAN VLC media player"\r
+            "DisplayName" "VideoLAN VLC media player ${VERSION}"\r
         WriteRegStr HKLM \\r
             SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \\r
             "UninstallString" '"$INSTDIR\uninstall.exe"'\r
        WriteUninstaller "uninstall.exe"\r
 \r
-       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Install_Dir" $INSTDIR\r
-       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "${VERSION}"\r
+       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "InstallDir" $INSTDIR\r
+       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Version" "${VERSION}"\r
 \r
        Exec "explorer $SMPROGRAMS\VideoLAN\"\r
 SectionEnd\r