Update contrib to a newer faad2 version, which is used in 0.9.0 (fixes various...

Update contrib to a newer faad2 version, which is used in 0.9.0 (fixes various problems with older libfaad library).

extras/contrib/src/Makefile

@@ -797,12 +797,12 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz
 #	(cd $@; patch -p 0 < ../Patches/faad2.patch)
 #	(cd $@; sh ./bootstrap)
 
-faad2-$(FAAD2_VERSION).tar.bz2:
+faad2-$(FAAD2_VERSION).tar.gz:
 	$(WGET) $(FAAD2_URL)
 
-faad: faad2-$(FAAD2_VERSION).tar.bz2
-	$(EXTRACT_BZ2)
-	(cd $@; patch -p 0  < ../Patches/faad2.patch && ./bootstrap)
+faad2: faad2-$(FAAD2_VERSION).tar.gz
+	$(EXTRACT_GZ)
+	(cd $@; ./bootstrap)
 
 .faad: faad
 	(cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
@@ -811,7 +811,7 @@ faad: faad2-$(FAAD2_VERSION).tar.bz2
 
 CLEAN_FILE += .faad
 CLEAN_PKG += faad
-DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.bz2
+DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
 
 # ***************************************************************************
 # faac

extras/contrib/src/packages.mak

@@ -71,8 +71,9 @@ SPEEX_URL=http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar
 SHOUT_VERSION=2.2.2
 SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
 FAAD2_VERSION=20040923
-FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
-FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
+FAAD2_VERSION=2.6.1
+FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
+#FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
 FAAC_VERSION=1.24
 FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.bz2
 LAME_VERSION=3.97b2