diff options
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/encx264.c | 15 | ||||
| -rw-r--r-- | libhb/work.c | 8 |
2 files changed, 8 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( ¶m, name, value ); diff --git a/libhb/work.c b/libhb/work.c index e9b15d6de..d8fc4d98d 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -525,6 +525,14 @@ static void do_job( hb_job_t * job, int cpu_count ) free( audio ); continue; } + if( audio->config.out.codec != HB_ACODEC_AC3 && + audio->config.out.codec != HB_ACODEC_DCA && + audio->config.out.samplerate > 48000 ) + { + hb_log( "Sample rate %d not supported. Down-sampling to 48kHz.", + audio->config.out.samplerate ); + audio->config.out.samplerate = 48000; + } if ( audio->config.in.codec == HB_ACODEC_FFMPEG ) { if ( aud_id_uses[audio->id] ) |