summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordynaflash <dynaflashtech@gmail.com>2009-10-19 22:16:26 +0000
committerdynaflash <dynaflashtech@gmail.com>2009-10-19 22:16:26 +0000
commit7c58ec4ca6b8e37efd8abc8bec139925a98d7ef9 (patch)
treec513b37d7ab79f6ecf99585d69e283c37ba8ac5c
parent23fb2706d3b4e2594829d70275df8c4c21f07688 (diff)
MacGui: fix borked previous commit 2891
- thanks Rodeo. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2892 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--macosx/Controller.m12
1 files changed, 1 insertions, 11 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m
index f9c4f6b07..2143a2020 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2870,12 +2870,6 @@ fWorkingCount = 0;
if( job->vcodec & HB_VCODEC_X264 )
{
- /* Set this flag to switch from Constant Quantizer(default) to Constant Rate Factor Thanks jbrjake
- Currently only used with Constant Quality setting*/
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultCrf"] > 0 && [fVidQualityMatrix selectedRow] == 2)
- {
- job->crf = 1;
- }
/* Below Sends x264 options to the core library if x264 is selected*/
/* Lets use this as per Nyx, Thanks Nyx!*/
@@ -4569,7 +4563,7 @@ the user is using "Custom" settings by determining the sender*/
* so that we can choose a new similar value on the new slider scale */
float previousMaxValue = [fVidQualitySlider maxValue];
float previousPercentOfSliderScale = [fVidQualitySlider floatValue] / ([fVidQualitySlider maxValue] - [fVidQualitySlider minValue] + 1);
- NSString * qpRFLabelString = @"QP:";
+ NSString * qpRFLabelString = @"RF:";
/* x264 0-51 */
if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_X264)
{
@@ -4578,10 +4572,6 @@ the user is using "Custom" settings by determining the sender*/
/* As x264 allows for qp/rf values that are fractional, we get the value from the preferences */
int fractionalGranularity = 1 / [[NSUserDefaults standardUserDefaults] floatForKey:@"x264CqSliderFractional"];
[fVidQualitySlider setNumberOfTickMarks:(([fVidQualitySlider maxValue] - [fVidQualitySlider minValue]) * fractionalGranularity) + 1];
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultCrf"] > 0)
- {
- qpRFLabelString = @"RF:";
- }
}
/* ffmpeg 1-31 */
if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_FFMPEG )