diff options
| -rw-r--r-- | libhb/platform/macosx/encca_aac.c | 13 | ||||
| -rw-r--r-- | macosx/Controller.m | 9 | ||||
| -rw-r--r-- | macosx/HBPreviewController.m | 2 |
3 files changed, 9 insertions, 15 deletions
diff --git a/libhb/platform/macosx/encca_aac.c b/libhb/platform/macosx/encca_aac.c index 66cac1e62..d6d0af0c9 100644 --- a/libhb/platform/macosx/encca_aac.c +++ b/libhb/platform/macosx/encca_aac.c @@ -415,15 +415,12 @@ static hb_buffer_t * Encode( hb_work_object_t * w ) return NULL; } - obuf->start = pv->pts; - pv->pts += 90000LL * pv->isamples / pv->osamplerate; - obuf->stop = pv->pts; obuf->size = odesc.mDataByteSize; - - hb_buffer_tag_t tag; - tag.id = HB_TAG_AUDIO; - tag.u.audio.frametype = HB_FRAME_AUDIO; - hb_buffer_add_tag( obuf, &tag ); + obuf->s.start = pv->pts; + pv->pts += 90000LL * pv->isamples / pv->osamplerate; + obuf->s.stop = pv->pts; + obuf->s.type = AUDIO_BUF; + obuf->s.frametype = HB_FRAME_AUDIO; return obuf; } 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]; |