Merge remote branch 'internal/upstream' into HEAD

[platform/upstream/libvpx.git] / ivfenc.c

diff --git a/ivfenc.c b/ivfenc.c
index 9afcf7c..3a50198 100644 (file)
--- a/ivfenc.c
+++ b/ivfenc.c
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #endif
+#include "vpx_config.h"
 #include "vpx/vp8cx.h"
 #include "vpx_ports/mem_ops.h"
 #include "vpx_ports/vpx_timer.h"
@@ -44,6 +45,9 @@ static const struct codec_item
     unsigned int             fourcc;
 } codecs[] =
 {
+#if CONFIG_EXPERIMENTAL && CONFIG_VP8_ENCODER
+    {"vp8x",  &vpx_codec_vp8x_cx_algo, 0x78385056},
+#endif
 #if CONFIG_VP8_ENCODER
     {"vp8",  &vpx_codec_vp8_cx_algo, 0x30385056},
 #endif
@@ -811,7 +815,8 @@ int main(int argc, const char **argv_)
     /* Handle codec specific options */
 #if CONFIG_VP8_ENCODER
 
-    if (codec->iface == &vpx_codec_vp8_cx_algo)
+    if (codec->iface == &vpx_codec_vp8_cx_algo ||
+        codec->iface == &vpx_codec_vp8x_cx_algo)
     {
         ctrl_args = vp8_args;
         ctrl_args_map = vp8_arg_ctrl_map;