Commit a3139ceb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

* Some small updates in the contribs

* FFMpeg reactivated the WM3-codec. The patch is now useless
parent 54cfbbc8
...@@ -923,7 +923,6 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 ...@@ -923,7 +923,6 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
ffmpeg: ffmpeg:
$(SVN) co $(FFMPEG_SVN) ffmpeg $(SVN) co $(FFMPEG_SVN) ffmpeg
(cd $@;patch -p 0 < ../Patches/ffmpeg-vc1.patch)
ifeq ($(HOST),i586-pc-beos) ifeq ($(HOST),i586-pc-beos)
(cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch) (cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch)
endif endif
......
Index: libavcodec/allcodecs.c
===================================================================
--- libavcodec/allcodecs.c (revision 5823)
+++ libavcodec/allcodecs.c (working copy)
@@ -229,11 +229,9 @@
#ifdef CONFIG_VC1_DECODER
register_avcodec(&vc1_decoder);
#endif //CONFIG_VC1_DECODER
-/* Reenable when it stops crashing on every file, causing bug report spam.
#ifdef CONFIG_WMV3_DECODER
register_avcodec(&wmv3_decoder);
#endif //CONFIG_WMV3_DECODER
-*/
#ifdef CONFIG_H263I_DECODER
register_avcodec(&h263i_decoder);
#endif //CONFIG_H263I_DECODER
...@@ -67,7 +67,7 @@ FLAC_VERSION=1.1.2 ...@@ -67,7 +67,7 @@ FLAC_VERSION=1.1.2
FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz
SPEEX_VERSION=1.1.12 SPEEX_VERSION=1.1.12
SPEEX_URL=http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz SPEEX_URL=http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
SHOUT_VERSION=2.2 SHOUT_VERSION=2.2.2
SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
FAAD2_VERSION=20040923 FAAD2_VERSION=20040923
FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2 FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
...@@ -154,9 +154,9 @@ QT4_VERSION=4.2.0-tp1 ...@@ -154,9 +154,9 @@ QT4_VERSION=4.2.0-tp1
QT4_URL=$(VIDEOLAN)/testing/contrib/qt4-$(QT4_VERSION)-win32-bin.tar.gz QT4_URL=$(VIDEOLAN)/testing/contrib/qt4-$(QT4_VERSION)-win32-bin.tar.gz
ZLIB_VERSION=1.2.3 ZLIB_VERSION=1.2.3
ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
XML_VERSION=2.6.22 XML_VERSION=2.6.26
XML_URL=ftp://xmlsoft.org/libxml2/libxml2-$(XML_VERSION).tar.gz XML_URL=ftp://xmlsoft.org/libxml2/libxml2-$(XML_VERSION).tar.gz
DIRAC_VERSION=0.5.3 DIRAC_VERSION=0.5.4
DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz
DX_HEADERS_URL=$(VIDEOLAN)/testing/contrib/win32-dx7headers.tgz DX_HEADERS_URL=$(VIDEOLAN)/testing/contrib/win32-dx7headers.tgz
DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers.tgz DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers.tgz
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment