ref: d7457ccdb610cbcaca67fd7c2baf174d5ede78ba
parent: a62acf3c0ac35fc3763296f68dc02b23d65165ab
parent: a0ce226e3050f9b27360f69ee676e6f70fa36f80
author: James Zern <[email protected]>
date: Sun Oct 12 22:20:04 EDT 2014
Merge "yv12config: fix highbitdepth build"
--- a/vpx_scale/generic/yv12config.c
+++ b/vpx_scale/generic/yv12config.c
@@ -10,7 +10,6 @@
#include <assert.h>
-#include "./vpx_config.h"
#include "vpx_scale/yv12config.h"
#include "vpx_mem/vpx_mem.h"
#if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
--- a/vpx_scale/yv12config.h
+++ b/vpx_scale/yv12config.h
@@ -15,6 +15,7 @@
extern "C" {
#endif
+#include "./vpx_config.h"
#include "vpx/vpx_codec.h"
#include "vpx/vpx_frame_buffer.h"
#include "vpx/vpx_integer.h"