summaryrefslogtreecommitdiffstats
path: root/libhb/muxmp4.c
diff options
context:
space:
mode:
authorsr55 <[email protected]>2011-04-18 12:10:07 +0000
committersr55 <[email protected]>2011-04-18 12:10:07 +0000
commite63f490b2e0a90bafb690e1d1f1f1e2f44729309 (patch)
treeba6efe28059341ad798d5e20d1682233e057e55c /libhb/muxmp4.c
parent4d2dce20625d08032eb25dd2d98c3d4319d8e0d9 (diff)
HE-AAC support for the OSX port. Thanks go to amarcus, ritsuka and rodeo.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3937 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/muxmp4.c')
-rw-r--r--libhb/muxmp4.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c
index b1148819a..3df70dc17 100644
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
@@ -420,11 +420,13 @@ rate_found2:
}
}
else if( audio->config.out.codec == HB_ACODEC_FAAC ||
- audio->config.out.codec == HB_ACODEC_CA_AAC )
+ audio->config.out.codec == HB_ACODEC_CA_AAC ||
+ audio->config.out.codec == HB_ACODEC_CA_HAAC )
{
+ int samples_per_frame = ( audio->config.out.codec == HB_ACODEC_CA_HAAC ) ? 2048 : 1024;
mux_data->track = MP4AddAudioTrack(
m->file,
- audio->config.out.samplerate, 1024, MP4_MPEG4_AUDIO_TYPE );
+ audio->config.out.samplerate, samples_per_frame, MP4_MPEG4_AUDIO_TYPE );
/* Tune track chunk duration */
MP4TuneTrackDurationPerChunk( m, mux_data->track );