Merge branch '0.9-bugfix' of git@git.videolan.org:vlc into 0.9-bugfix

Makefile.am

@@ -721,7 +721,7 @@ package-win-common:
 if BUILD_MOZILLA
 	mkdir -p "$(win32_destdir)/mozilla"
 	cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/
-	cp $(top_builddir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
+	cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
 endif
 
 # ActiveX plugin
@@ -732,7 +732,7 @@ if BUILD_ACTIVEX
 	unix2dos $(win32_destdir)/activex/*
 
 	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
-	cp $(top_builddir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
+	cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
 endif
 
 # Rebase all those DLLs to speed up loading (need cygwin rebase)

extras/package/win32/libvlc.dll.manifest

@@ -11,11 +11,11 @@
 		<dependentAssembly>
 			<assemblyIdentity
 				type="win32"
-				name="Microsoft-Windows-MSVCRT20"
-				version="6.0.6000.16386"
+				name="Microsoft.VC80.CRT"
+				version="8.0.41204.256"
 				processorArchitecture="x86"
-				publicKeyToken="31bf3856ad364e35"
-				language="*"
+				publicKeyToken="1fc8b3b9a1e18e3b"
+				language="neutral"
 			/>
 		</dependentAssembly>
 	</dependency>

extras/package/win32/vlc.exe.manifest

@@ -23,11 +23,11 @@
 		<dependentAssembly>
 			<assemblyIdentity
 				type="win32"
-				name="Microsoft-Windows-MSVCRT20"
-				version="6.0.6000.16386"
+				name="Microsoft.VC80.CRT"
+				version="8.0.41204.256"
 				processorArchitecture="x86"
-				publicKeyToken="31bf3856ad364e35"
-				language="*"
+				publicKeyToken="1fc8b3b9a1e18e3b"
+				language="neutral"
 			/>
 		</dependentAssembly>
 	</dependency>

projects/activex/axvlc.dll.manifest

@@ -11,11 +11,11 @@
 		<dependentAssembly>
 			<assemblyIdentity
 				type="win32"
-				name="Microsoft-Windows-MSVCRT20"
-				version="6.0.6000.16386"
+				name="Microsoft.VC80.CRT"
+				version="8.0.41204.256"
 				processorArchitecture="x86"
-				publicKeyToken="31bf3856ad364e35"
-				language="*"
+				publicKeyToken="1fc8b3b9a1e18e3b"
+				language="neutral"
 			/>
 		</dependentAssembly>
 	</dependency>

projects/mozilla/npvlc.dll.manifest

@@ -11,11 +11,11 @@
 		<dependentAssembly>
 			<assemblyIdentity
 				type="win32"
-				name="Microsoft-Windows-MSVCRT20"
-				version="6.0.6000.16386"
+				name="Microsoft.VC80.CRT"
+				version="8.0.41204.256"
 				processorArchitecture="x86"
-				publicKeyToken="31bf3856ad364e35"
-				language="*"
+				publicKeyToken="1fc8b3b9a1e18e3b"
+				language="neutral"
 			/>
 		</dependentAssembly>
 	</dependency>