ref: d7caee2170f9413d26977418fdeabd45fe615707
parent: 43cbdc216d218c18feb7188c68d6293927ffe7f8
author: James Zern <jzern@google.com>
date: Thu Sep 7 20:06:25 EDT 2017
vpx_scale_test.h: remove #if from inside macro fixes visual studio error Change-Id: I86206f17ca951b15e247c1b92561847d8c21ec7a
--- a/test/vpx_scale_test.h
+++ b/test/vpx_scale_test.h
@@ -50,11 +50,13 @@
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);
}