summaryrefslogtreecommitdiff
path: root/vpxenc.c
diff options
context:
space:
mode:
Diffstat (limited to 'vpxenc.c')
-rwxr-xr-xvpxenc.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/vpxenc.c b/vpxenc.c
index 2c133e718..0abcfb2ae 100755
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -31,6 +31,7 @@
#include <fcntl.h>
#include <unistd.h>
#endif
+#include "vpx_config.h"
#include "vpx_version.h"
#include "vpx/vp8cx.h"
#include "vpx_ports/mem_ops.h"
@@ -67,6 +68,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
@@ -1305,7 +1309,11 @@ 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
+#if CONFIG_EXPERIMENTAL
+ || codec->iface == &vpx_codec_vp8x_cx_algo
+#endif
+ )
{
ctrl_args = vp8_args;
ctrl_args_map = vp8_arg_ctrl_map;