Fix conflicts with OpenVisualCloud#70

Signed-off-by: Christopher Degawa <ccom@randomderp.com>
1480c1 · Nov 13, 2019 · d3afc60 · d3afc60
1 parent e5477ad
commit d3afc60
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Source/Lib/Codec/EbCodingLoop.c b/Source/Lib/Codec/EbCodingLoop.c
@@ -3966,7 +3966,7 @@ EB_EXTERN void EncodePass(
                             tuSizeChroma = (colorFormat == EB_YUV444 ? 32: 16);
                         }
 
-                        //TU LOOP for MV mode + Luma CBF decision.
+                        //TU LOOP for MV mode + Luma CBF decision. 
                         contextPtr->forceCbfFlag = (contextPtr->skipQpmFlag) ?
                             EB_FALSE :
                             lcuPtr->lcuEdgeInfoPtr->tileLeftEdgeFlag && ((tuOriginX & 63) == 0) && (tuOriginY == lcuOriginY);
@@ -3978,7 +3978,7 @@ EB_EXTERN void EncodePass(
                                 lcuStatPtr->stationaryEdgeOverTimeFlag,
                                 pictureControlSetPtr->temporalLayerIndex > 0 ? lcuStatPtr->pmStationaryEdgeOverTimeFlag : lcuStatPtr->stationaryEdgeOverTimeFlag);
 
-                        // Set Fast El coef shaping method
+                        // Set Fast El coef shaping method 
                         contextPtr->transCoeffShapeLuma     = DEFAULT_SHAPE;
                         contextPtr->transCoeffShapeChroma   = DEFAULT_SHAPE;
 
@@ -4167,7 +4167,7 @@ EB_EXTERN void EncodePass(
                                 lcuStatPtr->stationaryEdgeOverTimeFlag,
                                 pictureControlSetPtr->temporalLayerIndex > 0 ? lcuStatPtr->pmStationaryEdgeOverTimeFlag : lcuStatPtr->stationaryEdgeOverTimeFlag);
 
-                        // Set Fast El coef shaping method
+                        // Set Fast El coef shaping method 
                         contextPtr->transCoeffShapeLuma     = DEFAULT_SHAPE;
                         contextPtr->transCoeffShapeChroma   = DEFAULT_SHAPE;