[x265] [PATCH 2 of 2] presets: bpyramid default value reset to 1

[deepthi at multicorewareinc.com]

# HG changeset patch
# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
# Date 1385808240 -19800
# Branch stable
# Node ID 87dc694fc016c95803c4d58300daf16402724470
# Parent  b08f3853adb9fce2a991292dd93a8af2bb0c7c71
presets: bpyramid default value reset to 1

No support for strict b-pyramid yet.

diff -r b08f3853adb9 -r 87dc694fc016 source/common/common.cpp
--- a/source/common/common.cpp	Sat Nov 30 16:09:59 2013 +0530
+++ b/source/common/common.cpp	Sat Nov 30 16:14:00 2013 +0530
@@ -164,7 +164,7 @@
     param->bframes = 4;
     param->lookaheadDepth = 20;
     param->bFrameAdaptive = X265_B_ADAPT_TRELLIS;
-    param->bpyramid = 2;
+    param->bpyramid = 1;
     param->scenecutThreshold = 40; /* Magic number pulled in from x264 */
 
     /* Intra Coding Tools */
@@ -278,7 +278,6 @@
             param->maxCUSize = 32;
             param->searchRange = 28;
             param->bFrameAdaptive = 0;
-            param->bpyramid = 1;
             param->subpelRefine = 0;
             param->maxNumMergeCand = 2;
             param->searchMethod = X265_DIA_SEARCH;
@@ -298,7 +297,6 @@
             param->maxCUSize = 32;
             param->searchRange = 44;
             param->bFrameAdaptive = 0;
-            param->bpyramid = 1;
             param->subpelRefine = 1;
             param->bEnableRectInter = 0;
             param->bEnableAMP = 0;
@@ -312,7 +310,6 @@
             param->lookaheadDepth = 15;
             param->maxCUSize = 32;
             param->bFrameAdaptive = 0;
-            param->bpyramid = 1;
             param->subpelRefine = 1;
             param->bEnableRectInter = 0;
             param->bEnableAMP = 0;
@@ -324,7 +321,6 @@
         {
             param->lookaheadDepth = 15;
             param->bFrameAdaptive = 0;
-            param->bpyramid = 1;
             param->bEnableRectInter = 0;
             param->bEnableAMP = 0;
             param->bEnableEarlySkip = 1;
@@ -334,7 +330,6 @@
         else if (!strcmp(preset, "fast"))
         {
             param->lookaheadDepth = 15;
-            param->bpyramid = 1;
             param->bEnableRectInter = 0;
             param->bEnableAMP = 0;
         }
@@ -346,7 +341,6 @@
         {
             param->lookaheadDepth = 25;
             param->bframes = 4;
-            param->bpyramid = 1;
             param->rdLevel = 1;
             param->subpelRefine = 3;
             param->maxNumMergeCand = 3;