commit 94ad37070d1bb8bcc31dd1ba1960827d70b578b5
author Urvang Joshi <urvang@google.com> Wed Dec 06 11:38:08 2017 -0800
committer Urvang Joshi <urvang@google.com> Mon Dec 11 20:04:07 2017 +0000
tree 89c54b424691d76bf5a1470aa0f2419052091573
parent a0bba1b25e5df5aae8bd6117d61b0c59876574ad

Merge FRAME_SUPERRES into HORZONLY_FRAME_SUPERRES.

Change-Id: I5fc45fa9fe6a354ae34001f48850eb68364a5a79

av1/common/alloccommon.c

diff --git a/av1/common/alloccommon.c b/av1/common/alloccommon.c
index b60fc83..3687596 100644
--- a/av1/common/alloccommon.c
+++ b/av1/common/alloccommon.c
@@ -141,11 +141,11 @@
 
 // Now we need to allocate enough space to store the line buffers for the
 // stripes
-#if CONFIG_FRAME_SUPERRES
+#if CONFIG_HORZONLY_FRAME_SUPERRES
   const int frame_w = cm->superres_upscaled_width;
 #else
   const int frame_w = cm->width;
-#endif  // CONFIG_FRAME_SUPERRES
+#endif  // CONFIG_HORZONLY_FRAME_SUPERRES
 #if CONFIG_HIGHBITDEPTH
   const int use_highbd = cm->use_highbitdepth ? 1 : 0;
 #else