summaryrefslogtreecommitdiffstats
path: root/contrib/x265
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2019-07-20 12:18:04 -0400
committerBradley Sepos <[email protected]>2019-07-20 12:18:16 -0400
commit8b079d9d8900b5e410ae77e787483dabf4e9ad6a (patch)
treebcf204f635979471d4aea60c9b4ccae76589fad8 /contrib/x265
parentb1d77405043622f98492a6a725d0d0b388cfba4d (diff)
contrib: Update to x265 3.1.1.
Diffstat (limited to 'contrib/x265')
-rw-r--r--contrib/x265/A00-animation-tune.patch22
-rw-r--r--contrib/x265/module.defs10
2 files changed, 5 insertions, 27 deletions
diff --git a/contrib/x265/A00-animation-tune.patch b/contrib/x265/A00-animation-tune.patch
deleted file mode 100644
index 1067da43b..000000000
--- a/contrib/x265/A00-animation-tune.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/source/x265.h b/source/x265.h
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -1835,17 +1835,17 @@ static const char * const x265_preset_na
- * with ultrafast mapping to "0" and placebo mapping to "9". This mapping may
- * of course change if new presets are added in between, but will always be
- * ordered from fastest to slowest.
- *
- * Warning: the speed of these presets scales dramatically. Ultrafast is a full
- * 100 times faster than placebo!
- *
- * Currently available tunings are: */
--static const char * const x265_tune_names[] = { "psnr", "ssim", "grain", "zerolatency", "fastdecode", 0 };
-+static const char * const x265_tune_names[] = { "psnr", "ssim", "grain", "zerolatency", "animation", "fastdecode", 0 };
-
- /* returns 0 on success, negative on failure (e.g. invalid preset/tune name). */
- int x265_param_default_preset(x265_param *, const char *preset, const char *tune);
-
- /* x265_picture_alloc:
- * Allocates an x265_picture instance. The returned picture structure is not
- * special in any way, but using this method together with x265_picture_free()
- * and x265_picture_init() allows some version safety. New picture fields will
diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
index ac21f799b..fef5f0707 100644
--- a/contrib/x265/module.defs
+++ b/contrib/x265/module.defs
@@ -2,11 +2,11 @@ __deps__ := X265_8 X265_10 X265_12
$(eval $(call import.MODULE.defs,X265,x265,$(__deps__)))
$(eval $(call import.CONTRIB.defs,X265))
-X265.FETCH.url = https://download.handbrake.fr/contrib/x265_3.0.tar.gz
-X265.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_3.0.tar.gz
-X265.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_3.0.tar.gz
-X265.FETCH.sha256 = c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662
-X265.EXTRACT.tarbase = x265_3.0
+X265.FETCH.url = https://download.handbrake.fr/contrib/x265_3.1.1.tar.gz
+X265.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_3.1.1.tar.gz
+X265.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_3.1.1.tar.gz
+X265.FETCH.sha256 = 827900c7cc0a0105b8a96460fab7cd22b97afa7b2835b5cb979c44bddaa3c8d0
+X265.EXTRACT.tarbase = x265_3.1.1
# Silence "warning: overriding recipe for target" messages
X265.FETCH.target =