# HG changeset patch
# User Aarthi Thirumalai <[email protected]>
# Date 1500872870 -19800
# Mon Jul 24 10:37:50 2017 +0530
# Node ID ab80975559be17eed12f4e90f82390321435f65d
# Parent 01a981f509eaf98461b719dcc9fdd5a9bed05b6e
api.cpp: fix warnings in x265_encoder_reconfig
diff -r 01a981f509ea -r ab80975559be source/encoder/api.cpp
--- a/source/encoder/api.cpp Thu Jul 13 19:37:37 2017 +0530
+++ b/source/encoder/api.cpp Mon Jul 24 10:37:50 2017 +0530
@@ -191,7 +191,7 @@
if (encoder->m_latestParam->forceFlush != param_in->forceFlush)
return encoder->reconfigureParam(encoder->m_latestParam, param_in);
bool isReconfigureRc = encoder->isReconfigureRc(encoder->m_latestParam,
param_in);
- if (encoder->m_reconfigure && !isReconfigureRc || encoder->m_reconfigureRc
&& isReconfigureRc) /* Reconfigure in progress */
+ if ((encoder->m_reconfigure && !isReconfigureRc) ||
(encoder->m_reconfigureRc && isReconfigureRc)) /* Reconfigure in progress */
return 1;
memcpy(&save, encoder->m_latestParam, sizeof(x265_param));
int ret = encoder->reconfigureParam(encoder->m_latestParam, param_in);
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
