From df9477dfa60ebb5d31bc142e58ce46535c17abce Mon Sep 17 00:00:00 2001 From: trav90 Date: Wed, 17 Oct 2018 05:59:08 -0500 Subject: Update aom to slightly newer commit ID --- third_party/aom/tools_common.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'third_party/aom/tools_common.c') diff --git a/third_party/aom/tools_common.c b/third_party/aom/tools_common.c index 353021093..d1115ac27 100644 --- a/third_party/aom/tools_common.c +++ b/third_party/aom/tools_common.c @@ -128,12 +128,9 @@ int read_yuv_frame(struct AvxInputContext *input_ctx, aom_image_t *yuv_frame) { return shortread; } -#if CONFIG_ENCODERS - -static const AvxInterface aom_encoders[] = { #if CONFIG_AV1_ENCODER +static const AvxInterface aom_encoders[] = { { "av1", AV1_FOURCC, &aom_codec_av1_cx }, -#endif }; int get_aom_encoder_count(void) { @@ -152,15 +149,11 @@ const AvxInterface *get_aom_encoder_by_name(const char *name) { return NULL; } +#endif // CONFIG_AV1_ENCODER -#endif // CONFIG_ENCODERS - -#if CONFIG_DECODERS - -static const AvxInterface aom_decoders[] = { #if CONFIG_AV1_DECODER +static const AvxInterface aom_decoders[] = { { "av1", AV1_FOURCC, &aom_codec_av1_dx }, -#endif }; int get_aom_decoder_count(void) { @@ -190,8 +183,7 @@ const AvxInterface *get_aom_decoder_by_fourcc(uint32_t fourcc) { return NULL; } - -#endif // CONFIG_DECODERS +#endif // CONFIG_AV1_DECODER // TODO(dkovalev): move this function to aom_image.{c, h}, so it will be part // of aom_image_t support -- cgit v1.2.3