summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorritsuka <[email protected]>2009-01-11 09:21:22 +0000
committerritsuka <[email protected]>2009-01-11 09:21:22 +0000
commita2341c963575ff6643ebf0c55c58c029805623d5 (patch)
tree28c9605cb8b970d06260a31de13f9cdb4dac774a
parent93a7f537451f43058b6663cf7a9ab214e06cfeb1 (diff)
Always use the track samplerate as the timescale for audio tracks. This fixes a problem when creating an mp4 with multiple audio tracks that have different samplerate.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2074 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/muxmp4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c
index bd54b11ce..0069716bf 100644
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
@@ -302,7 +302,7 @@ static int MP4Init( hb_mux_object_t * m )
mux_data->track = MP4AddAC3AudioTrack(
m->file,
- m->samplerate,
+ audio->config.out.samplerate,
fscod,
bsid,
bsmod,
@@ -326,7 +326,7 @@ static int MP4Init( hb_mux_object_t * m )
} else {
mux_data->track = MP4AddAudioTrack(
m->file,
- m->samplerate, 1024, MP4_MPEG4_AUDIO_TYPE );
+ audio->config.out.samplerate, 1024, MP4_MPEG4_AUDIO_TYPE );
if (audio->config.out.name == NULL) {
MP4SetTrackBytesProperty(
m->file, mux_data->track,