Commit 70deaf00 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "tools_common: fix build w/encoders/decoders disabled"

parents b04dad32 8465c938
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment