[vlc-commits] contrib: aom: fix user private data missing when film grain is applied

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Sep 12 11:22:36 2018 +0200| [d5bb06d1a4d55892e782aea49a054f2a6da6e177] | committer: Steve Lhomme

contrib: aom: fix user private data missing when film grain is applied

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

 .../src/aom/film-grain-copy-the-user_priv-from-the-img.patch   | 10 ++++++++++
 contrib/src/aom/rules.mak                                      |  1 +
 2 files changed, 11 insertions(+)

diff --git a/contrib/src/aom/film-grain-copy-the-user_priv-from-the-img.patch b/contrib/src/aom/film-grain-copy-the-user_priv-from-the-img.patch
new file mode 100644
index 0000000000..0ea5020efd
--- /dev/null
+++ b/contrib/src/aom/film-grain-copy-the-user_priv-from-the-img.patch
@@ -0,0 +1,10 @@
+--- aom/av1/av1_dx_iface.c.userpriv	2018-06-27 11:19:42.000000000 +0200
++++ aom/av1/av1_dx_iface.c	2018-09-12 11:28:11.342088000 +0200
+@@ -610,6 +610,7 @@ aom_image_t *add_grain_if_needed(aom_ima
+   }
+ 
+   av1_add_film_grain(grain_params, img, grain_img_buf);
++  grain_img_buf->user_priv = img->user_priv;
+ 
+   return grain_img_buf;
+ }
diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index 91b875ab0b..9aee683d69 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -19,6 +19,7 @@ aom: aom-$(AOM_VERSION).tar.gz .sum-aom
 	rm -Rf $@-$(AOM_VERSION) $@
 	mkdir -p $@-$(AOM_VERSION)
 	tar xvzf "$<" -C $@-$(AOM_VERSION)
+	$(APPLY) $(SRC)/aom/film-grain-copy-the-user_priv-from-the-img.patch
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/aom/aom-pthreads-win32.patch
 endif