diff options
| author | Johann <johannkoenig@google.com> | 2015-01-30 15:05:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-02-02 08:35:56 -0800 |
| commit | b50e518ab633ad9c63f21de814af8b94de642bfc (patch) | |
| tree | 8ba666ce7373fcaa749a163e26e1c0937ab512fc /vpxenc.c | |
| parent | fd354b2e1e4cc662af49d4f535c231c1d8760ef6 (diff) | |
| download | libvpx-b50e518ab633ad9c63f21de814af8b94de642bfc.tar libvpx-b50e518ab633ad9c63f21de814af8b94de642bfc.tar.gz libvpx-b50e518ab633ad9c63f21de814af8b94de642bfc.tar.bz2 libvpx-b50e518ab633ad9c63f21de814af8b94de642bfc.zip | |
Require webm when explicitly requested
https://code.google.com/p/webm/issues/detail?id=906
Change-Id: I72841078ff81152d21d84ccf4d5548e757685a6d
Diffstat (limited to 'vpxenc.c')
| -rw-r--r-- | vpxenc.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -183,8 +183,10 @@ static const arg_def_t recontest = ARG_DEF_ENUM( NULL, "test-decode", 1, "Test encode/decode mismatch", test_decode_enum); static const arg_def_t framerate = ARG_DEF( NULL, "fps", 1, "Stream frame rate (rate/scale)"); +static const arg_def_t use_webm = ARG_DEF( + NULL, "webm", 0, "Output WebM (default when WebM IO is enabled)"); static const arg_def_t use_ivf = ARG_DEF( - NULL, "ivf", 0, "Output IVF (default is WebM if WebM IO is enabled)"); + NULL, "ivf", 0, "Output IVF"); static const arg_def_t out_part = ARG_DEF( "P", "output-partitions", 0, "Makes encoder output partitions. Requires IVF output!"); @@ -208,7 +210,7 @@ static const arg_def_t *main_args[] = { &debugmode, &outputfile, &codecarg, &passes, &pass_arg, &fpf_name, &limit, &skip, &deadline, &best_dl, &good_dl, &rt_dl, - &quietarg, &verbosearg, &psnrarg, &use_ivf, &out_part, &q_hist_n, + &quietarg, &verbosearg, &psnrarg, &use_webm, &use_ivf, &out_part, &q_hist_n, &rate_hist_n, &disable_warnings, &disable_warning_prompt, NULL }; @@ -1059,6 +1061,12 @@ static int parse_stream_params(struct VpxEncoderConfig *global, } else if (arg_match(&arg, &fpmbf_name, argi)) { config->fpmb_stats_fn = arg.val; #endif + } else if (arg_match(&arg, &use_webm, argi)) { +#if CONFIG_WEBM_IO + config->write_webm = 1; +#else + die("Error: --webm specified but webm is disabled."); +#endif } else if (arg_match(&arg, &use_ivf, argi)) { config->write_webm = 0; } else if (arg_match(&arg, &threads, argi)) { |