X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fencx264.c;h=2a3c2b6e2861d0d6d060151848908b7afbe6bb52;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=91b53f7646d6222eed947c102e8d41da70e5cae2;hpb=c2e76c3f637261d8c0b6399a9bdb7f075f3e2b36;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/encx264.c b/libhb/encx264.c
index 91b53f76..2a3c2b6e 100644
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -123,9 +123,6 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
         }
     }
     
-    /* Temporary hack to use old b-pyramid default */
-    param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
-
     /* Enable metrics */
     param.analyse.b_psnr = 1;
     param.analyse.b_ssim = 1;
@@ -221,18 +218,6 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
                 value++;
             }
 
-            if( !( strcmp( name, "b-pyramid" ) ) )
-            {
-                if( value == NULL || !strcmp( value, "1" ) )
-                {
-                    value = "normal";
-                }
-                else if( !strcmp( value, "0" ) )
-                {
-                    value = "none";
-                }
-            }
-
             /* Here's where the strings are passed to libx264 for parsing. */
             ret = x264_param_parse( &param, name, value );