From 8465c938f1fd6fb6bf2fc82de442bf1df2e029d7 Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 10 Aug 2015 16:45:49 -0700 Subject: [PATCH] tools_common: fix build w/encoders/decoders disabled gcc-based builds will allow a 0-element array, but visual studio builds will not; this change hides the encoder and decoder specific symbols as modules using them are selected based on the configuration. Change-Id: Ic16ba9d12241070ec689dc5880164c14a4f7ca44 --- tools_common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools_common.c b/tools_common.c index 8d356af3f..fe3401c79 100644 --- a/tools_common.c +++ b/tools_common.c @@ -130,6 +130,8 @@ int read_yuv_frame(struct VpxInputContext *input_ctx, vpx_image_t *yuv_frame) { return shortread; } +#if CONFIG_ENCODERS + static const VpxInterface vpx_encoders[] = { #if CONFIG_VP8_ENCODER {"vp8", VP8_FOURCC, &vpx_codec_vp8_cx}, @@ -160,6 +162,10 @@ const VpxInterface *get_vpx_encoder_by_name(const char *name) { return NULL; } +#endif // CONFIG_ENCODERS + +#if CONFIG_DECODERS + static const VpxInterface vpx_decoders[] = { #if CONFIG_VP8_DECODER {"vp8", VP8_FOURCC, &vpx_codec_vp8_dx}, @@ -202,6 +208,8 @@ const VpxInterface *get_vpx_decoder_by_fourcc(uint32_t fourcc) { return NULL; } +#endif // CONFIG_DECODERS + // TODO(dkovalev): move this function to vpx_image.{c, h}, so it will be part // of vpx_image_t support int vpx_img_plane_width(const vpx_image_t *img, int plane) {