diff options
| author | James Zern <jzern@google.com> | 2015-08-10 16:45:49 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-08-10 16:48:47 -0700 |
| commit | 8465c938f1fd6fb6bf2fc82de442bf1df2e029d7 (patch) | |
| tree | 2961e0fb369f99186b11426ce4839058faec0e39 | |
| parent | 1d723572b9de9a26151a877c3f28a4fa83c5e7d9 (diff) | |
| download | libvpx-8465c938f1fd6fb6bf2fc82de442bf1df2e029d7.tar libvpx-8465c938f1fd6fb6bf2fc82de442bf1df2e029d7.tar.gz libvpx-8465c938f1fd6fb6bf2fc82de442bf1df2e029d7.tar.bz2 libvpx-8465c938f1fd6fb6bf2fc82de442bf1df2e029d7.zip | |
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
| -rw-r--r-- | tools_common.c | 8 |
1 files changed, 8 insertions, 0 deletions
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) { |