* modules/access/dvdread.c: backport of #11298.

[vlc] / activex / axvlc.inf

diff --git a/activex/axvlc.inf b/activex/axvlc.inf
index 1f8e6771aa4e4146c87a260974d80c9286dbbbc1..736b7cad0a7b29a835936b7ab97dc104cdc1373d 100644 (file)
--- a/activex/axvlc.inf
+++ b/activex/axvlc.inf
@@ -1,11 +1,23 @@
+; Version number and signature of INF file.\r
+;\r
 [version]\r
   signature="$CHICAGO$"\r
   AdvancedINF=2.0\r
+\r
 [Add.Code]\r
+  vlc-0.8.2-svn-win32.exe\r
   axvlc.dll=axvlc.dll\r
+\r
 [axvlc.dll]\r
-  file-win32-x86=thiscab\r
+  FileVersion=0,8,2,0\r
   clsid={E23FE9C6-778E-49d4-B537-38FCDE4887D8}\r
+  RegisterServer=no\r
+  hook=nsiinstaller\r
+\r
+[vlc-0.8.2-svn-win32.exe]\r
   FileVersion=0,8,2,0\r
-  DestDir=10\r
-  RegisterServer=yes\r
+  file-win32-x86=thiscab\r
+\r
+[nsiinstaller]\r
+  run=%EXTRACT_DIR%\vlc-0.8.2-svn-win32.exe\r
+\r