Merge commit '03cd6e79e0f2f7b64b0192ff0360c51808e02cb1'

ShiftMediaProject · Aug 11, 2019 · f437a96 · f437a96
2 parents a8fe074 + 03cd6e7
commit f437a96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.hgtags b/.hgtags
@@ -36,3 +36,4 @@ bad4e598cac7cdd3df4623c68c91299c620471bd 3.0-rc
 113518629fa54ffb491dd479e15c1f00dd39d376 3.1_RC1
 b4e38ce16d7c4b37a6482dc7ae61fd31071b6ff1 3.1_RC2
 acce27790559b68f93319cd21b588f90aa93c0b1 3.1
+6f7c2ae0d5bd46506b7a772abebd7eff3fa3bbcb 3.1.1
diff --git a/source/common/param.cpp b/source/common/param.cpp
@@ -2372,7 +2372,7 @@ void x265_copy_params(x265_param* dst, x265_param* src)
     dst->bLowPassDct = src->bLowPassDct;
     dst->vbvBufferEnd = src->vbvBufferEnd;
     dst->vbvEndFrameAdjust = src->vbvEndFrameAdjust;
-
+    dst->bAnalysisType = src->bAnalysisType;
     dst->bCopyPicToFrame = src->bCopyPicToFrame;
     if (src->analysisSave) dst->analysisSave=strdup(src->analysisSave);
     else dst->analysisSave = NULL;