ref: 70deaf00eb4a035247fd102337f949bff7b1f232
parent: b04dad328c33874ae1eda72c73079519935a3feb
parent: 8465c938f1fd6fb6bf2fc82de442bf1df2e029d7
author: James Zern <jzern@google.com>
date: Tue Aug 11 21:52:55 EDT 2015
Merge "tools_common: fix build w/encoders/decoders disabled"
--- a/tools_common.c
+++ b/tools_common.c
@@ -130,6 +130,8 @@
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 @@
return NULL;
}
+#endif // CONFIG_ENCODERS
+
+#if CONFIG_DECODERS
+
static const VpxInterface vpx_decoders[] = {#if CONFIG_VP8_DECODER
{"vp8", VP8_FOURCC, &vpx_codec_vp8_dx},@@ -201,6 +207,8 @@
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