[x265] [PATCH] Fix for line endings in param.cpp

[pooja]

# HG changeset patch
# User Pooja Venkatesan <po...@multicorewareinc.com>
# Date 1562303835 -19800
#      Fri Jul 05 10:47:15 2019 +0530
# Node ID 48a39f4bed5b069325349f8309c371a2afca1254
# Parent  b36c03e4e7719da0c708218192357a17f0a3d42b
Fix for line endings in param.cpp

diff -r b36c03e4e771 -r 48a39f4bed5b source/common/param.cpp
--- a/source/common/param.cpp   Tue Jun 18 19:49:26 2019 +0530
+++ b/source/common/param.cpp   Fri Jul 05 10:47:15 2019 +0530
@@ -361,7 +361,7 @@
 
         if (!strcmp(preset, "ultrafast"))
         {
-            param->maxNumMergeCand = 2;
+            param->maxNumMergeCand = 2;
             param->bIntraInBFrames = 0;
             param->lookaheadDepth = 5;
             param->scenecutThreshold = 0; // disable lookahead
@@ -385,7 +385,7 @@
         }
         else if (!strcmp(preset, "superfast"))
         {
-            param->maxNumMergeCand = 2;
+            param->maxNumMergeCand = 2;
             param->bIntraInBFrames = 0;
             param->lookaheadDepth = 10;
             param->maxCUSize = 32;
@@ -405,8 +405,8 @@
         }
         else if (!strcmp(preset, "veryfast"))
         {
-            param->maxNumMergeCand = 2;
-            param->limitReferences = 3;
+            param->maxNumMergeCand = 2;
+            param->limitReferences = 3;
             param->bIntraInBFrames = 0;
             param->lookaheadDepth = 15;
             param->bFrameAdaptive = 0;
@@ -418,8 +418,8 @@
         }
         else if (!strcmp(preset, "faster"))
         {
-            param->maxNumMergeCand = 2;
-            param->limitReferences = 3;
+            param->maxNumMergeCand = 2;
+            param->limitReferences = 3;
             param->bIntraInBFrames = 0;
             param->lookaheadDepth = 15;
             param->bFrameAdaptive = 0;
@@ -429,9 +429,9 @@
         }
         else if (!strcmp(preset, "fast"))
         {
-            param->maxNumMergeCand = 2;
-            param->limitReferences = 3;
-            param->bEnableEarlySkip = 0;
+            param->maxNumMergeCand = 2;
+            param->limitReferences = 3;
+            param->bEnableEarlySkip = 0;
             param->bIntraInBFrames = 0;
             param->lookaheadDepth = 15;
             param->bFrameAdaptive = 0;
@@ -445,8 +445,8 @@
         }
         else if (!strcmp(preset, "slow"))
         {
-            param->limitReferences = 3;
-            param->bEnableEarlySkip = 0;
+            param->limitReferences = 3;
+            param->bEnableEarlySkip = 0;
             param->bIntraInBFrames = 0;
             param->bEnableRectInter = 1;
             param->lookaheadDepth = 25;

# HG changeset patch
# User Pooja Venkatesan <po...@multicorewareinc.com>
# Date 1562303835 -19800
#      Fri Jul 05 10:47:15 2019 +0530
# Node ID 48a39f4bed5b069325349f8309c371a2afca1254
# Parent  b36c03e4e7719da0c708218192357a17f0a3d42b
Fix for line endings in param.cpp

diff -r b36c03e4e771 -r 48a39f4bed5b source/common/param.cpp
--- a/source/common/param.cpp	Tue Jun 18 19:49:26 2019 +0530
+++ b/source/common/param.cpp	Fri Jul 05 10:47:15 2019 +0530
@@ -361,7 +361,7 @@
 
         if (!strcmp(preset, "ultrafast"))
         {
-            param->maxNumMergeCand = 2;
+            param->maxNumMergeCand = 2;
             param->bIntraInBFrames = 0;
             param->lookaheadDepth = 5;
             param->scenecutThreshold = 0; // disable lookahead
@@ -385,7 +385,7 @@
         }
         else if (!strcmp(preset, "superfast"))
         {
-            param->maxNumMergeCand = 2;
+            param->maxNumMergeCand = 2;
             param->bIntraInBFrames = 0;
             param->lookaheadDepth = 10;
             param->maxCUSize = 32;
@@ -405,8 +405,8 @@
         }
         else if (!strcmp(preset, "veryfast"))
         {
-            param->maxNumMergeCand = 2;
-            param->limitReferences = 3;
+            param->maxNumMergeCand = 2;
+            param->limitReferences = 3;
             param->bIntraInBFrames = 0;
             param->lookaheadDepth = 15;
             param->bFrameAdaptive = 0;
@@ -418,8 +418,8 @@
         }
         else if (!strcmp(preset, "faster"))
         {
-            param->maxNumMergeCand = 2;
-            param->limitReferences = 3;
+            param->maxNumMergeCand = 2;
+            param->limitReferences = 3;
             param->bIntraInBFrames = 0;
             param->lookaheadDepth = 15;
             param->bFrameAdaptive = 0;
@@ -429,9 +429,9 @@
         }
         else if (!strcmp(preset, "fast"))
         {
-            param->maxNumMergeCand = 2;
-            param->limitReferences = 3;
-            param->bEnableEarlySkip = 0;
+            param->maxNumMergeCand = 2;
+            param->limitReferences = 3;
+            param->bEnableEarlySkip = 0;
             param->bIntraInBFrames = 0;
             param->lookaheadDepth = 15;
             param->bFrameAdaptive = 0;
@@ -445,8 +445,8 @@
         }
         else if (!strcmp(preset, "slow"))
         {
-            param->limitReferences = 3;
-            param->bEnableEarlySkip = 0;
+            param->limitReferences = 3;
+            param->bEnableEarlySkip = 0;
             param->bIntraInBFrames = 0;
             param->bEnableRectInter = 1;
             param->lookaheadDepth = 25;

_______________________________________________
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel