Commit d7caee21 authored by James Zern's avatar James Zern
Browse files

vpx_scale_test.h: remove #if from inside macro

fixes visual studio error

Change-Id: I86206f17ca951b15e247c1b92561847d8c21ec7a
parent 43cbdc21
......@@ -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);
}
......
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