[vlc-commits] contrib: x265 1.2

[Rafaël Carré]

vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jul 11 14:24:43 2014 +0200| [2b794465bc15bd9bccb8a7fb58846dc3a41a0382] | committer: Felix Paul Kühne

contrib: x265 1.2

(cherry picked from commit bddfbfd7cef1930ea7adc5259c53375ac461dafe)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

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

 contrib/src/x265/SHA512SUMS |    2 +-
 contrib/src/x265/rules.mak  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/x265/SHA512SUMS b/contrib/src/x265/SHA512SUMS
index b5289d1..74c46e6 100644
--- a/contrib/src/x265/SHA512SUMS
+++ b/contrib/src/x265/SHA512SUMS
@@ -1 +1 @@
-aa700503758d0fa6cfa73dc564f083e61420145c94ece1ddcdfe83e08cad85ed8b4c01967f55346b62a7ce151e366b374584f88a7e3f3a7f68e271bb13b3c38c  x265-1.1.tar.bz2
+60591f5c7bff651b8bae23e14d15ccf2752e1c6edc4547508a8349888d99c9d3f513fe9515acfaaaa8073f6e2f022f6bdc35e5d34516bc75f9fddf3d74018daa  x265-1.2.tar.bz2
diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak
index 9c21eb9..8e1325e 100644
--- a/contrib/src/x265/rules.mak
+++ b/contrib/src/x265/rules.mak
@@ -1,7 +1,7 @@
 # x265
 
 #X265_GITURL := https://github.com/videolan/x265
-X265_VERSION := 1.1
+X265_VERSION := 1.2
 X265_SNAPURL := https://bitbucket.org/multicoreware/x265/get/$(X265_VERSION).tar.bz2
 
 ifdef BUILD_ENCODERS