From 1e681d98ac5a9b719052b672d985d59a8b529236 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 15 Aug 2014 21:00:09 -0700 Subject: [PATCH] vpxdec: fix compile with --disable-libyuv Change-Id: I267103595f28c9d9dce2bc38e6db4e371acc7235 --- vpxdec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vpxdec.c b/vpxdec.c index faee42a..59c58af 100644 --- a/vpxdec.c +++ b/vpxdec.c @@ -15,13 +15,16 @@ #include #include +#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; -- 2.7.4