diff options
| author | James Zern <jzern@google.com> | 2014-10-13 02:20:04 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-13 02:20:04 -0700 |
| commit | d7457ccdb610cbcaca67fd7c2baf174d5ede78ba (patch) | |
| tree | 363e2dae46956d53959fee49ae5cf0ff7df4ec5a | |
| parent | a62acf3c0ac35fc3763296f68dc02b23d65165ab (diff) | |
| parent | a0ce226e3050f9b27360f69ee676e6f70fa36f80 (diff) | |
| download | libvpx-d7457ccdb610cbcaca67fd7c2baf174d5ede78ba.tar libvpx-d7457ccdb610cbcaca67fd7c2baf174d5ede78ba.tar.gz libvpx-d7457ccdb610cbcaca67fd7c2baf174d5ede78ba.tar.bz2 libvpx-d7457ccdb610cbcaca67fd7c2baf174d5ede78ba.zip | |
Merge "yv12config: fix highbitdepth build"
| -rw-r--r-- | vpx_scale/generic/yv12config.c | 1 | ||||
| -rw-r--r-- | vpx_scale/yv12config.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/vpx_scale/generic/yv12config.c b/vpx_scale/generic/yv12config.c index fde5044a2..00a8c163a 100644 --- 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 diff --git a/vpx_scale/yv12config.h b/vpx_scale/yv12config.h index c5ac44b12..b9f13fd89 100644 --- 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" |