diff options
| author | eddyg <[email protected]> | 2008-02-16 01:13:09 +0000 |
|---|---|---|
| committer | eddyg <[email protected]> | 2008-02-16 01:13:09 +0000 |
| commit | d6308581fa42b2c7503430c0fb8c3d9a828edb50 (patch) | |
| tree | 2cd868f10e943bd612ebe21e2589322040eff83f /libhb/sync.c | |
| parent | 0b8c4601d56a6cc153d3543b782a975a0e725fc4 (diff) | |
Allow mac gui to select AC-3 + AAC at the same time, still needs CLI work for the same.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1267 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/sync.c')
| -rw-r--r-- | libhb/sync.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libhb/sync.c b/libhb/sync.c index 4f04c224f..8bdf0c20c 100644 --- a/libhb/sync.c +++ b/libhb/sync.c @@ -144,7 +144,8 @@ void syncClose( hb_work_object_t * w ) for( i = 0; i < hb_list_count( title->list_audio ); i++ ) { - if( job->acodec & HB_ACODEC_AC3 ) + if( job->acodec & HB_ACODEC_AC3 || + job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 ) { free( pv->sync_audio[i].ac3_buf ); } @@ -206,7 +207,8 @@ static void InitAudio( hb_work_object_t * w, int i ) sync = &pv->sync_audio[i]; sync->audio = hb_list_item( title->list_audio, i ); - if( job->acodec & HB_ACODEC_AC3 ) + if( job->acodec & HB_ACODEC_AC3 || + job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 ) { /* Have a silent AC-3 frame ready in case we have to fill a gap */ @@ -637,7 +639,8 @@ static void SyncAudio( hb_work_object_t * w, int i ) sync = &pv->sync_audio[i]; audio = sync->audio; - if( job->acodec & HB_ACODEC_AC3 ) + if( job->acodec & HB_ACODEC_AC3 || + job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 ) { fifo = audio->fifo_out; rate = audio->rate; @@ -799,7 +802,8 @@ static void SyncAudio( hb_work_object_t * w, int i ) } } - if( job->acodec & HB_ACODEC_AC3 ) + if( job->acodec & HB_ACODEC_AC3 || + job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 ) { buf = hb_fifo_get( audio->fifo_raw ); buf->start = start; @@ -915,7 +919,8 @@ static void InsertSilence( hb_work_object_t * w, int i ) job = pv->job; sync = &pv->sync_audio[i]; - if( job->acodec & HB_ACODEC_AC3 ) + if( job->acodec & HB_ACODEC_AC3 || + job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 ) { buf = hb_buffer_init( sync->ac3_size ); buf->start = sync->count_frames * 90000 / sync->audio->rate; |