[x265-commits] [x265] common: set a default color space of I420

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/d9ea97e248bc
branches:  
changeset: 4912:d9ea97e248bc
user:      Steve Borho <steve at borho.org>
date:      Wed Nov 06 17:51:38 2013 -0600
description:
common: set a default color space of I420
Subject: [x265] cli: do not lookup a colorspace name if not supplied

details:   http://hg.videolan.org/x265/rev/60f78cbfacc8
branches:  
changeset: 4913:60f78cbfacc8
user:      Steve Borho <steve at borho.org>
date:      Wed Nov 06 17:51:53 2013 -0600
description:
cli: do not lookup a colorspace name if not supplied

diffstat:

 source/common/common.cpp |  1 +
 source/x265.cpp          |  3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r dbb86150c919 -r 60f78cbfacc8 source/common/common.cpp
--- a/source/common/common.cpp	Wed Nov 06 16:30:44 2013 -0600
+++ b/source/common/common.cpp	Wed Nov 06 17:51:53 2013 -0600
@@ -143,6 +143,7 @@ void x265_param_default(x265_param *para
     param->bEnableWavefront = 1;
     param->frameNumThreads = 1;
     param->inputBitDepth = 8;
+    param->sourceCsp = X265_CSP_I420;
 
     /* CU definitions */
     param->maxCUSize = 64;
diff -r dbb86150c919 -r 60f78cbfacc8 source/x265.cpp
--- a/source/x265.cpp	Wed Nov 06 16:30:44 2013 -0600
+++ b/source/x265.cpp	Wed Nov 06 17:51:53 2013 -0600
@@ -477,7 +477,8 @@ bool CLIOptions::parse(int argc, char **
     }
     else if (inputRes)
     {
-        parseCspName(inputCsp, &param->sourceCsp);
+        if (inputCsp)
+            parseCspName(inputCsp, &param->sourceCsp);
         this->input->setColorSpace(param->sourceCsp);
         sscanf(inputRes, "%dx%d", &param->sourceWidth, &param->sourceHeight);
         this->input->setDimensions(param->sourceWidth, param->sourceHeight);