Commit 55399af0 authored by Steve Lhomme's avatar Steve Lhomme

contrib: aom: don't realloc the film-grain cache image when the dimension is even

We want even dimensions, not odd ones. That's what the allocation that follows
does.
parent 72b2f55e
--- aom/av1/av1_dx_iface.c.grain_odd 2018-09-13 10:21:03.995541200 +0200
+++ aom/av1/av1_dx_iface.c 2018-09-13 10:21:32.212545400 +0200
@@ -598,7 +598,7 @@ aom_image_t *add_grain_if_needed(aom_ima
if (grain_img_buf &&
(img->d_w != grain_img_buf->d_w || img->d_h != grain_img_buf->d_h ||
- img->fmt != grain_img_buf->fmt || !(img->d_h % 2) || !(img->d_w % 2))) {
+ img->fmt != grain_img_buf->fmt || (img->d_h % 2) || (img->d_w % 2))) {
aom_img_free(grain_img_buf);
grain_img_buf = NULL;
}
......@@ -21,6 +21,7 @@ aom: aom-$(AOM_VERSION).tar.gz .sum-aom
tar xvzf "$<" -C $@-$(AOM_VERSION)
$(APPLY) $(SRC)/aom/film-grain-copy-the-user_priv-from-the-img.patch
$(APPLY) $(SRC)/aom/aom-film-grain-leak.patch
$(APPLY) $(SRC)/aom/aom-film-grain-realloc-fix.patch
ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/aom/aom-pthreads-win32.patch
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment