diff options
| author | jbrjake <[email protected]> | 2008-02-21 16:28:12 +0000 |
|---|---|---|
| committer | jbrjake <[email protected]> | 2008-02-21 16:28:12 +0000 |
| commit | 27276d64617365214bccf37b5b03e41bdfbe1963 (patch) | |
| tree | 9bab69ca94110d9a4db1ddb01d647f540758d34f /libhb/muxmkv.c | |
| parent | a9fc11d6273d3fc72618fa5dcc0f62e53b794509 (diff) | |
AAC+AC3 in MKV
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1311 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/muxmkv.c')
| -rw-r--r-- | libhb/muxmkv.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c index bcf3427ae..58de30fa1 100644 --- a/libhb/muxmkv.c +++ b/libhb/muxmkv.c @@ -173,9 +173,18 @@ static int MKVInit( hb_mux_object_t * m ) } break; case HB_ACODEC_FAAC: - track->codecPrivate = audio->config.aac.bytes; - track->codecPrivateSize = audio->config.aac.length; - track->codecID = MK_ACODEC_AAC; + if( job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 ) + { + track->codecPrivate = NULL; + track->codecPrivateSize = 0; + track->codecID = MK_ACODEC_AC3; + } + else + { + track->codecPrivate = audio->config.aac.bytes; + track->codecPrivateSize = audio->config.aac.length; + track->codecID = MK_ACODEC_AAC; + } break; default: *job->die = 1; @@ -192,7 +201,7 @@ static int MKVInit( hb_mux_object_t * m ) track->trackType = MK_TRACK_AUDIO; track->language = audio->iso639_2; track->extra.audio.samplingFreq = (float)job->arate; - track->extra.audio.channels = (job->acodec == HB_ACODEC_AC3) ? HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(audio->input_channel_layout) : HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->amixdown); + track->extra.audio.channels = (job->acodec == HB_ACODEC_AC3 || job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 ) ? HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(audio->input_channel_layout) : HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->amixdown); // track->defaultDuration = job->arate * 1000; mux_data->track = mk_createTrack(m->file, track); if (job->acodec == HB_ACODEC_VORBIS && track->codecPrivate != NULL) |