]> granicus.if.org Git - libvpx/commitdiff
vpx_scale_test.h: remove #if from inside macro
authorJames Zern <jzern@google.com>
Fri, 8 Sep 2017 07:06:25 +0000 (00:06 -0700)
committerJames Zern <jzern@google.com>
Fri, 8 Sep 2017 07:06:25 +0000 (00:06 -0700)
fixes visual studio error

Change-Id: I86206f17ca951b15e247c1b92561847d8c21ec7a

test/vpx_scale_test.h

index 01910c086d5a70a367a9f93b406c5590a314f62d..18909d1b5ef303c3bcf5209c135146307b52d29b 100644 (file)
@@ -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);
   }