summaryrefslogtreecommitdiff
path: root/vpxenc.c
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2014-05-16 18:52:01 -0700
committerDeb Mukherjee <debargha@google.com>2014-05-20 17:19:57 -0700
commit47031c0a54b2054c98066919dbd1e71c60b3c4f4 (patch)
treef98d5d2e026459b5074e75864578dee9fef7c8f0 /vpxenc.c
parentef750d8472a9cd9cb7dbc9f0bb356e5da8d57e8d (diff)
downloadlibvpx-47031c0a54b2054c98066919dbd1e71c60b3c4f4.tar.gz
Updates libyuv to version 1005
Also adds compile check and a libyuv configure flag Change-Id: Ib9f0f4a71c4083e6f0aea7b5a5d175531ef0f66b
Diffstat (limited to 'vpxenc.c')
-rw-r--r--vpxenc.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/vpxenc.c b/vpxenc.c
index 4d9629408..d46a83eb0 100644
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -1268,6 +1268,7 @@ static void encode_frame(struct stream_state *stream,
fprintf(stderr, "%s can only scale 4:2:0 8bpp inputs\n", exec_name);
exit(EXIT_FAILURE);
}
+#if CONFIG_LIBYUV
if (!stream->img)
stream->img = vpx_img_alloc(NULL, VPX_IMG_FMT_I420,
cfg->g_w, cfg->g_h, 16);
@@ -1283,8 +1284,15 @@ static void encode_frame(struct stream_state *stream,
stream->img->stride[VPX_PLANE_V],
stream->img->d_w, stream->img->d_h,
kFilterBox);
-
img = stream->img;
+#else
+ stream->encoder.err = 1;
+ ctx_exit_on_error(&stream->encoder,
+ "Stream %d: Failed to encode frame.\n"
+ "Scaling disabled in this configuration. \n"
+ "To enable, configure with --enable-libyuv\n",
+ stream->index);
+#endif
}
vpx_usec_timer_start(&timer);