From: James Zern <jzern@google.com>
Date: Fri, 8 Sep 2017 07:06:25 +0000 (-0700)
Subject: vpx_scale_test.h: remove #if from inside macro
X-Git-Tag: v1.7.0~183
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7caee2170f9413d26977418fdeabd45fe615707;p=libvpx

vpx_scale_test.h: remove #if from inside macro

fixes visual studio error

Change-Id: I86206f17ca951b15e247c1b92561847d8c21ec7a
---

diff --git a/test/vpx_scale_test.h b/test/vpx_scale_test.h
index 01910c086..18909d1b5 100644
--- a/test/vpx_scale_test.h
+++ b/test/vpx_scale_test.h
@@ -50,11 +50,13 @@ class VpxScaleBase {
   void ResetScaleImage(YV12_BUFFER_CONFIG *const img, const int width,
                        const int height) {
     memset(img, 0, sizeof(*img));
-    ASSERT_EQ(0, vpx_alloc_frame_buffer(img, width, height, 1, 1,
 #if CONFIG_VP9_HIGHBITDEPTH
-                                        0,
-#endif
+    ASSERT_EQ(0, vpx_alloc_frame_buffer(img, width, height, 1, 1, 0,
                                         VP9_ENC_BORDER_IN_PIXELS, 0));
+#else
+    ASSERT_EQ(0, vpx_alloc_frame_buffer(img, width, height, 1, 1,
+                                        VP9_ENC_BORDER_IN_PIXELS, 0));
+#endif
     memset(img->buffer_alloc, kBufFiller, img->frame_size);
   }