diff options
| author | James Zern <jzern@google.com> | 2015-08-12 01:52:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-12 01:52:55 +0000 |
| commit | 70deaf00eb4a035247fd102337f949bff7b1f232 (patch) | |
| tree | fb3b5a401bdfc23b81ba14a05a91476bba497fce | |
| parent | b04dad328c33874ae1eda72c73079519935a3feb (diff) | |
| parent | 8465c938f1fd6fb6bf2fc82de442bf1df2e029d7 (diff) | |
| download | libvpx-70deaf00eb4a035247fd102337f949bff7b1f232.tar libvpx-70deaf00eb4a035247fd102337f949bff7b1f232.tar.gz libvpx-70deaf00eb4a035247fd102337f949bff7b1f232.tar.bz2 libvpx-70deaf00eb4a035247fd102337f949bff7b1f232.zip | |
Merge "tools_common: fix build w/encoders/decoders disabled"
| -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) { |