diff options
author | dynaflash <[email protected]> | 2012-03-28 01:18:33 +0000 |
---|---|---|
committer | dynaflash <[email protected]> | 2012-03-28 01:18:33 +0000 |
commit | 6ebb6203b59aecb21d502788f3390a5ca2d51cd1 (patch) | |
tree | 90d70e1c19024cc447947aade7a5f3e8a8f9833e /macosx | |
parent | 45b8f81a2e184e2b7deaf47afc49483766191a27 (diff) |
MacGui: fix commit 4546 so it works on os x which is the filter pipeline rework from j45.
- libhb fix by Rodeo
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4547 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/Controller.m | 9 | ||||
-rw-r--r-- | macosx/HBPreviewController.m | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index 69168b376..a170d8411 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -2746,8 +2746,6 @@ fWorkingCount = 0; hb_add( fQueueEncodeLibhb, job ); } - - hb_free_filters( job ); NSString *destinationDirectory = [[queueToApply objectForKey:@"DestinationPath"] stringByDeletingLastPathComponent]; [[NSUserDefaults standardUserDefaults] setObject:destinationDirectory forKey:@"LastDestinationDirectory"]; @@ -3076,6 +3074,7 @@ fWorkingCount = 0; hb_title_t * title = (hb_title_t *) hb_list_item( list, [fSrcTitlePopUp indexOfSelectedItem] ); hb_job_t * job = title->job; + hb_filter_object_t * filter; /* set job->angle for libdvdnav */ job->angle = [fSrcAnglePopUp indexOfSelectedItem] + 1; /* Chapter selection */ @@ -3348,9 +3347,9 @@ bool one_burned = FALSE; * The order of the filters is critical */ - hb_filter_object_t * filter; + /* Detelecine */ - hb_filter_detelecine.settings = NULL; + //hb_filter_detelecine.settings = NULL; filter = hb_filter_init( HB_FILTER_DETELECINE ); if ([fPictureController detelecine] == 1) { @@ -3476,6 +3475,7 @@ bool one_burned = FALSE; hb_title_t * title = (hb_title_t *) hb_list_item( list,0 ); // is always zero since now its a single title scan hb_job_t * job = title->job; hb_audio_config_t * audio; + hb_filter_object_t * filter; /* Title Angle for dvdnav */ job->angle = [[queueToApply objectForKey:@"TitleAngle"] intValue]; @@ -3892,7 +3892,6 @@ bool one_burned = FALSE; } } - hb_filter_object_t * filter; /* Now lets call the filters if applicable. * The order of the filters is critical */ diff --git a/macosx/HBPreviewController.m b/macosx/HBPreviewController.m index dd2cb6ec4..3ec00d2a3 100644 --- a/macosx/HBPreviewController.m +++ b/macosx/HBPreviewController.m @@ -905,8 +905,6 @@ job->indepth_scan = 0; job->pass = 0; hb_add( fPreviewLibhb, job ); - - hb_free_filters( job ); [fEncodingControlBox setHidden: NO]; [fPictureControlBox setHidden: YES]; |