Commit 456bfb19 authored by John Koleszar's avatar John Koleszar
Browse files

vpxenc: output webm by default

WebM should be preferred to IVF output, since it has wider tool support.

Change-Id: I5ac3d5cb68722e6c8af917cdba32ac01dd5e0ea2
parent ea68ee04
...@@ -768,12 +768,12 @@ static const arg_def_t psnrarg = ARG_DEF(NULL, "psnr", 0, ...@@ -768,12 +768,12 @@ static const arg_def_t psnrarg = ARG_DEF(NULL, "psnr", 0,
"Show PSNR in status line"); "Show PSNR in status line");
static const arg_def_t framerate = ARG_DEF(NULL, "framerate", 1, static const arg_def_t framerate = ARG_DEF(NULL, "framerate", 1,
"Stream frame rate (rate/scale)"); "Stream frame rate (rate/scale)");
static const arg_def_t use_webm = ARG_DEF(NULL, "webm", 0, static const arg_def_t use_ivf = ARG_DEF(NULL, "ivf", 0,
"Output WebM (default is IVF)"); "Output IVF (default is WebM)");
static const arg_def_t *main_args[] = static const arg_def_t *main_args[] =
{ {
&codecarg, &passes, &pass_arg, &fpf_name, &limit, &deadline, &best_dl, &good_dl, &rt_dl, &codecarg, &passes, &pass_arg, &fpf_name, &limit, &deadline, &best_dl, &good_dl, &rt_dl,
&verbosearg, &psnrarg, &use_webm, &framerate, &verbosearg, &psnrarg, &use_ivf, &framerate,
NULL NULL
}; };
...@@ -966,7 +966,7 @@ int main(int argc, const char **argv_) ...@@ -966,7 +966,7 @@ int main(int argc, const char **argv_)
y4m_input y4m; y4m_input y4m;
struct vpx_rational arg_framerate = {30, 1}; struct vpx_rational arg_framerate = {30, 1};
int arg_have_framerate = 0; int arg_have_framerate = 0;
int write_webm = 0; int write_webm = 1;
EbmlGlobal ebml = {0}; EbmlGlobal ebml = {0};
exec_name = argv_[0]; exec_name = argv_[0];
...@@ -1044,8 +1044,8 @@ int main(int argc, const char **argv_) ...@@ -1044,8 +1044,8 @@ int main(int argc, const char **argv_)
arg_framerate = arg_parse_rational(&arg); arg_framerate = arg_parse_rational(&arg);
arg_have_framerate = 1; arg_have_framerate = 1;
} }
else if (arg_match(&arg, &use_webm, argi)) else if (arg_match(&arg, &use_ivf, argi))
write_webm = 1; write_webm = 0;
else else
argj++; argj++;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment