[vlc-commits] contrib: aom: update to latest tag

[Tristan Matthews]

vlc/vlc-3.0 | branch: master | Tristan Matthews <tmatth at videolan.org> | Fri Jan  4 12:26:04 2019 -0500| [b3f4f81d81d48742eb284658788e345e0c06a22b] | committer: Tristan Matthews

contrib: aom: update to latest tag

(cherry picked from commit a164f19379edba673d8a61b606f8ed8cd8ca90fe)

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

 ...-grain-copy-user_priv-from-the-source-img.patch | 28 ----------------------
 contrib/src/aom/rules.mak                          |  5 ++--
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/contrib/src/aom/0001-film-grain-copy-user_priv-from-the-source-img.patch b/contrib/src/aom/0001-film-grain-copy-user_priv-from-the-source-img.patch
deleted file mode 100644
index dd27f1ab99..0000000000
--- a/contrib/src/aom/0001-film-grain-copy-user_priv-from-the-source-img.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8884914546ee68a440342587c4a7c9189dbc8443 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolan.org>
-Date: Wed, 12 Sep 2018 11:18:15 +0200
-Subject: [PATCH] [film-grain] copy user_priv from the source img
-
-Since we don't return the original img we need to prive the same user_priv
-data as the aom_image_t that would be returned without film-grain.
-
-Change-Id: I6ac6c575b9ca34673018cf7533955afe4996e6fc
----
- av1/av1_dx_iface.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/av1/av1_dx_iface.c b/av1/av1_dx_iface.c
-index 8899556ca..f5e19ea5c 100644
---- a/av1/av1_dx_iface.c
-+++ b/av1/av1_dx_iface.c
-@@ -642,6 +642,7 @@ static aom_image_t *add_grain_if_needed(aom_image_t *img,
-       *grain_img_ptr = NULL;
-     }
-   }
-+  grain_img_buf->user_priv = img->user_priv;
- 
-   return grain_img_buf;
- }
--- 
-2.17.0.windows.1
-
diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index a13a7632ac..eb3f628952 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -1,6 +1,6 @@
 # aom
-AOM_HASH := a65377bf5c555fccd161f27c33168cc36390662e
-AOM_VERSION := v1.0.0-$(AOM_HASH)
+AOM_HASH := add4b15580e410c00c927ee366fa65545045a5d9
+AOM_VERSION := v1.0.0.errata.1
 AOM_GITURL := https://aomedia.googlesource.com/aom/+archive/$(AOM_HASH).tar.gz
 
 PKGS += aom
@@ -19,7 +19,6 @@ aom: aom-$(AOM_VERSION).tar.gz .sum-aom
 	rm -Rf $@-$(AOM_VERSION) $@
 	mkdir -p $@-$(AOM_VERSION)
 	tar xvzf "$<" -C $@-$(AOM_VERSION)
-	$(APPLY) $(SRC)/aom/0001-film-grain-copy-user_priv-from-the-source-img.patch
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/aom/aom-pthreads-win32.patch
 endif