diff options
| -rw-r--r-- | Jamrules | 2 | ||||
| -rw-r--r-- | contrib/patch-x264-macintel.patch | 4 | ||||
| -rw-r--r-- | contrib/version_x264.txt | 2 | ||||
| -rw-r--r-- | libhb/encx264.c | 16 | ||||
| -rw-r--r-- | macosx/HandBrake.plist | 2 | ||||
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 2 |
6 files changed, 9 insertions, 19 deletions
@@ -11,7 +11,7 @@ if ! $(DEFINES) Exit "Please run ./configure first." ; } -HB_VERSION = 0.7.1a1 ; +HB_VERSION = 0.7.1a2 ; HB_BUILD = 20060923 ; DEFINES += HB_VERSION=\\\"$(HB_VERSION)\\\" HB_BUILD=$(HB_BUILD) ; LANGUAGES = fr de it pl ru nl es pt ja ; diff --git a/contrib/patch-x264-macintel.patch b/contrib/patch-x264-macintel.patch index b2219fd9d..9a409968c 100644 --- a/contrib/patch-x264-macintel.patch +++ b/contrib/patch-x264-macintel.patch @@ -5,11 +5,11 @@ ; section instead until NASM is fixed. %macro SECTION_RODATA 0 - %ifidn __OUTPUT_FORMAT__,macho -- SECTION .text +- SECTION .text align=16 - fakegot: - %else +; %ifidn __OUTPUT_FORMAT__,macho -+; SECTION .text ++; SECTION .text align=16 +; fakegot: +; %else SECTION .rodata data align=16 diff --git a/contrib/version_x264.txt b/contrib/version_x264.txt index 9d6f6289f..098252c03 100644 --- a/contrib/version_x264.txt +++ b/contrib/version_x264.txt @@ -1 +1 @@ -http://multics.dynalias.com/handbrake/contrib/x264-r568.tar.gz +http://multics.dynalias.com/handbrake/contrib/x264-r604.tar.gz diff --git a/libhb/encx264.c b/libhb/encx264.c index 53950fa5e..a72a9603e 100644 --- a/libhb/encx264.c +++ b/libhb/encx264.c @@ -78,33 +78,23 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job ) if( job->vquality >= 0.0 && job->vquality <= 1.0 ) { /* Constant QP */ + param.rc.i_rc_method = X264_RC_CQP; param.rc.i_qp_constant = 51 - job->vquality * 51; hb_log( "encx264: encoding at constant QP %d", param.rc.i_qp_constant ); } else { - - /* Rate control */ - /* no longer in x264 - see rc.i_rc_method in x264.h */ - /* param.rc.b_cbr = 1; */ - - /* these were the only settings I could use to get accurate ending video bitrate */ - param.rc.i_rc_method = X264_RC_CRF; - param.rc.i_vbv_max_bitrate = job->vbitrate; - param.rc.i_vbv_buffer_size = 224; - param.rc.i_rf_constant = 1; - + /* Rate control */ + param.rc.i_rc_method = X264_RC_ABR; param.rc.i_bitrate = job->vbitrate; switch( job->pass ) { case 1: - param.rc.i_rc_method = X264_RC_ABR; param.rc.b_stat_write = 1; param.rc.psz_stat_out = pv->filename; break; case 2: - param.rc.i_rc_method = X264_RC_ABR; param.rc.b_stat_read = 1; param.rc.psz_stat_in = pv->filename; break; diff --git a/macosx/HandBrake.plist b/macosx/HandBrake.plist index dd96953c4..6c0abfefc 100644 --- a/macosx/HandBrake.plist +++ b/macosx/HandBrake.plist @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.7.1</string> + <string>0.7.1a2</string> <key>CFBundleSignature</key> <string>HB##</string> <key>CFBundleVersion</key> diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index b213e1ab1..3dcd1e222 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -552,7 +552,7 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.1; + CURRENT_PROJECT_VERSION = 0.7.1a2; FRAMEWORK_SEARCH_PATHS = ""; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; |