# HG changeset patch # User Matti Hamalainen # Date 1479287853 -7200 # Node ID c04221f4d5964a99814bb505df16ab2252982009 # Parent 772086c29cc77e92887b8499b3f5ead43e4112b0 Fix two cases of incorrect preprocessor token usage. diff -r 772086c29cc7 -r c04221f4d596 x265/source/common/param.cpp --- a/x265/source/common/param.cpp Wed Nov 16 11:16:33 2016 +0200 +++ b/x265/source/common/param.cpp Wed Nov 16 11:17:33 2016 +0200 @@ -1396,7 +1396,7 @@ return NULL; #define BOOL(param, cliopt) \ - s += sprintf(s, " %s", (param) ? cliopt : "no-"cliopt); + s += sprintf(s, " %s", (param) ? cliopt : "no-" cliopt); s += sprintf(s, "%dx%d", p->sourceWidth,p->sourceHeight); s += sprintf(s, " fps=%u/%u", p->fpsNum, p->fpsDenom); diff -r 772086c29cc7 -r c04221f4d596 x265/source/encoder/ratecontrol.cpp --- a/x265/source/encoder/ratecontrol.cpp Wed Nov 16 11:16:33 2016 +0200 +++ b/x265/source/encoder/ratecontrol.cpp Wed Nov 16 11:17:33 2016 +0200 @@ -49,7 +49,7 @@ {\ bErr = 0;\ p = strstr(opts, opt "=");\ - char* q = strstr(opts, "no-"opt);\ + char* q = strstr(opts, "no-" opt);\ if (p && sscanf(p, opt "=%d" , &i) && param_val != i)\ bErr = 1;\ else if (!param_val && !q && !p)\