fix some preset issues

add b-pyramid=none to appletv presets and remove b-pyramid hack from encx264.c
change samplerate from 48 to 'Auto' in all presets
cap samplerate to 48khz since none of the encoders support higher rates
remove obsolete UsesMaxPictureSettings from all presets. replace with UsesPictureSettings=2



git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3424 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 0 insertions, 15 deletions

diff --git a/libhb/encx264.c b/libhb/encx264.c
index 91b53f764..2a3c2b6e2 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 );