From: John Koleszar <jkoleszar@google.com>
Date: Thu, 21 Oct 2010 20:23:20 +0000 (-0400)
Subject: vpxenc: output webm by default
X-Git-Tag: v0.9.5~22^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=456bfb196b3943b7a9b9ab1941d177dc11990f22;p=libvpx

vpxenc: output webm by default

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

Change-Id: I5ac3d5cb68722e6c8af917cdba32ac01dd5e0ea2
---

diff --git a/vpxenc.c b/vpxenc.c
index 3537419d8..6605ab88a 100644
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -768,12 +768,12 @@ static const arg_def_t psnrarg          = ARG_DEF(NULL, "psnr", 0,
         "Show PSNR in status line");
 static const arg_def_t framerate        = ARG_DEF(NULL, "framerate", 1,
         "Stream frame rate (rate/scale)");
-static const arg_def_t use_webm         = ARG_DEF(NULL, "webm", 0,
-        "Output WebM (default is IVF)");
+static const arg_def_t use_ivf          = ARG_DEF(NULL, "ivf", 0,
+        "Output IVF (default is WebM)");
 static const arg_def_t *main_args[] =
 {
     &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
 };
 
@@ -966,7 +966,7 @@ int main(int argc, const char **argv_)
     y4m_input                y4m;
     struct vpx_rational      arg_framerate = {30, 1};
     int                      arg_have_framerate = 0;
-    int                      write_webm = 0;
+    int                      write_webm = 1;
     EbmlGlobal               ebml = {0};
 
     exec_name = argv_[0];
@@ -1044,8 +1044,8 @@ int main(int argc, const char **argv_)
             arg_framerate = arg_parse_rational(&arg);
             arg_have_framerate = 1;
         }
-        else if (arg_match(&arg, &use_webm, argi))
-            write_webm = 1;
+        else if (arg_match(&arg, &use_ivf, argi))
+            write_webm = 0;
         else
             argj++;
     }