Mercurial > hg > forks > libbpg

changeset 1:c04221f4d596

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix two cases of incorrect preprocessor token usage.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 16 Nov 2016 11:17:33 +0200
parents 772086c29cc7
children bb21eb1cd483
files x265/source/common/param.cpp x265/source/encoder/ratecontrol.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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)\