Contribs: replace dshow headers by free ones

This replace with a set of headers from the Wine project, modified by
Jean-Baptiste Kempf
(cherry picked from commit 3759bee802342c0204b1104fc1aa9832147c00c7)

extras/contrib/src/Makefile

@@ -2111,19 +2111,19 @@ DISTCLEAN_PKG += win32-dx7headers.tgz
 # *************************************************************************
 # DirectShow headers
 # *************************************************************************
-dshow-headers.tgz:
+dshow-headers-oss.tar.bz2:
 	$(WGET) $(DSHOW_HEADERS_URL)
 
 dxva2api.h:
 	$(WGET) $(DXVA2_URL)
 
-.dshow_headers: dshow-headers.tgz dxva2api.h
-	tar xzf $< -C $(PREFIX)/include
+.dshow_headers: dshow-headers-oss.tar.bz2 dxva2api.h
+	tar xjf $< -C $(PREFIX)/include
 	cp dxva2api.h $(PREFIX)/include
 	touch $@
 
 CLEAN_FILE += .dshow_headers
-DISTCLEAN_PKG += dshow-headers.tgz dxva2api.h
+DISTCLEAN_PKG += dshow-headers-oss.tar.bz2 dxva2api.h
 
 # ***************************************************************************
 # libexpat

extras/contrib/src/packages.mak

@@ -187,7 +187,7 @@ XML_URL=http://xmlsoft.org/sources/libxml2-$(XML_VERSION).tar.gz
 DIRAC_VERSION=1.0.2
 DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz
 DX_HEADERS_URL=$(CONTRIB_VIDEOLAN)/win32-dx7headers.tgz
-DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers.tgz
+DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers-oss.tar.bz2
 PORTAUDIO_VERSION=19
 PORTAUDIO_URL=http://www.portaudio.com/archives/pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz
 CLINKCC_VERSION=171