[vlc-commits] Contribs: take latest x264 stable

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jan 21 16:43:28 2015 +0100| [f14a18edb35159e0856f536ce2b897dbd36a54e1] | committer: Jean-Baptiste Kempf

Contribs: take latest x264 stable

(cherry picked from commit b0b848e12a5ac3a9a051a2e6ee2815ac0844c5f3)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f14a18edb35159e0856f536ce2b897dbd36a54e1
---

 contrib/src/x264/rules.mak |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 34a567b..7a329ba 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -1,7 +1,7 @@
 # x264
 
 X264_GITURL := git://git.videolan.org/x264.git
-X264_SNAPURL := http://git.videolan.org/?p=x264.git;a=snapshot;h=HEAD;sf=tgz
+X264_SNAPURL := ftp://ftp.videolan.org/pub/videolan/x264/snapshots/last_stable_x264.tar.bz2
 X262_GITURL := git://git.videolan.org/x262.git
 
 ifdef BUILD_ENCODERS
@@ -47,38 +47,38 @@ $(TARBALLS)/x262-git.tar.gz:
 $(TARBALLS)/x26410b-git.tar.xz:
 	$(call download_git,$(X264_GITURL))
 
-$(TARBALLS)/x26410b-git.tar.gz:
+$(TARBALLS)/x26410b-git.tar.bz2:
 	$(call download,$(X264_SNAPURL))
 
 $(TARBALLS)/x264-git.tar.xz:
 	$(call download_git,$(X264_GITURL))
 
-$(TARBALLS)/x264-git.tar.gz:
+$(TARBALLS)/x264-git.tar.bz2:
 	$(call download,$(X264_SNAPURL))
 
 .sum-x262: x262-git.tar.gz
 	$(warning $@ not implemented)
 	touch $@
 
-.sum-x26410b: x26410b-git.tar.gz
+.sum-x26410b: x26410b-git.tar.bz2
 	$(warning $@ not implemented)
 	touch $@
 
-.sum-x264: x264-git.tar.gz
+.sum-x264: x264-git.tar.bz2
 	$(warning $@ not implemented)
 	touch $@
 
-x264: x264-git.tar.gz .sum-x264
+x264: x264-git.tar.bz2 .sum-x264
 	rm -Rf $@-git
 	mkdir -p $@-git
-	$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
+	$(BZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
-x26410b: x26410b-git.tar.gz .sum-x26410b
+x26410b: x26410b-git.tar.bz2 .sum-x26410b
 	rm -Rf $@-git
 	mkdir -p $@-git
-	$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
+	$(BZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)