summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure3
-rw-r--r--tools_common.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/configure b/configure
index 3ecb2ce6e..ac196dacb 100755
--- a/configure
+++ b/configure
@@ -194,6 +194,9 @@ fi
[ -d "${source_path}/vp9" ] || disable_feature vp9
[ -d "${source_path}/vp10" ] || disable_feature vp10
+# disable vp10 codec by default
+disable_feature vp10
+
# install everything except the sources, by default. sources will have
# to be enabled when doing dist builds, since that's no longer a common
# case.
diff --git a/tools_common.c b/tools_common.c
index 77e6becd5..20b259ca9 100644
--- a/tools_common.c
+++ b/tools_common.c
@@ -133,6 +133,10 @@ int read_yuv_frame(struct VpxInputContext *input_ctx, vpx_image_t *yuv_frame) {
#if CONFIG_ENCODERS
static const VpxInterface vpx_encoders[] = {
+#if CONFIG_VP10_ENCODER
+ {"vp10", VP10_FOURCC, &vpx_codec_vp10_cx},
+#endif
+
#if CONFIG_VP8_ENCODER
{"vp8", VP8_FOURCC, &vpx_codec_vp8_cx},
#endif
@@ -140,10 +144,6 @@ static const VpxInterface vpx_encoders[] = {
#if CONFIG_VP9_ENCODER
{"vp9", VP9_FOURCC, &vpx_codec_vp9_cx},
#endif
-
-#if CONFIG_VP10_ENCODER
- {"vp10", VP10_FOURCC, &vpx_codec_vp10_cx},
-#endif
};
int get_vpx_encoder_count(void) {