diff options
author | James Zern <jzern@google.com> | 2014-08-19 15:16:29 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-19 15:16:29 -0700 |
commit | 7b0faffcf850b26a6003ac14c62728c2b2f8878b (patch) | |
tree | 75ddc2fa9b3201456f2e4cfdabdb2b9716058c4a /vpxdec.c | |
parent | 7d870bd3ed49ae2be8ffaa4207f215111d77ad4a (diff) | |
parent | 58058818258218da7f0e0ca2320c5b8d89f42cdf (diff) | |
download | libvpx-7b0faffcf850b26a6003ac14c62728c2b2f8878b.tar.gz |
Merge changes I13d975d1,I26710359
* changes:
vpxenc: fix compile with --disable-libyuv
vpxdec: fix compile with --disable-libyuv
Diffstat (limited to 'vpxdec.c')
-rw-r--r-- | vpxdec.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -15,13 +15,16 @@ #include <string.h> #include <limits.h> +#include "./vpx_config.h" + +#if CONFIG_LIBYUV #include "third_party/libyuv/include/libyuv/scale.h" +#endif #include "./args.h" #include "./ivfdec.h" #define VPX_CODEC_DISABLE_COMPAT 1 -#include "./vpx_config.h" #include "vpx/vpx_decoder.h" #include "vpx_ports/mem_ops.h" #include "vpx_ports/vpx_timer.h" @@ -123,6 +126,7 @@ static const arg_def_t *vp8_pp_args[] = { }; #endif +#if CONFIG_LIBYUV static INLINE int vpx_image_scale(vpx_image_t *src, vpx_image_t *dst, FilterModeEnum mode) { assert(src->fmt == VPX_IMG_FMT_I420); @@ -137,6 +141,7 @@ static INLINE int vpx_image_scale(vpx_image_t *src, vpx_image_t *dst, dst->d_w, dst->d_h, mode); } +#endif void usage_exit() { int i; |