summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodeo <[email protected]>2012-07-24 22:04:51 +0000
committerRodeo <[email protected]>2012-07-24 22:04:51 +0000
commitf97b65287fdb31aa0f6ce41466c32156297342f3 (patch)
tree3424697b765b481c5e915cff179cf4e4fbf490f8
parentd45c3a5e8f2b56f55734f5816b0f62df9adfcefd (diff)
muxmkv: reset the output track configuration before adding each audio track, rather than just once before adding all audio tracks.
Among other things, avoids having the HE-AAC outputSamplingFreq contaminate all following non-HE or non-AAC tracks. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4874 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/muxmkv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c
index 303d98878..addd800de 100644
--- a/libhb/muxmkv.c
+++ b/libhb/muxmkv.c
@@ -196,8 +196,6 @@ static int MKVInit( hb_mux_object_t * m )
mux_data->track = mk_createTrack(m->file, track);
- memset(track, 0, sizeof(mk_TrackConfig));
-
/* add the audio tracks */
for( i = 0; i < hb_list_count( title->list_audio ); i++ )
{
@@ -207,7 +205,8 @@ static int MKVInit( hb_mux_object_t * m )
mux_data->codec = audio->config.out.codec;
- switch( audio->config.out.codec & HB_ACODEC_MASK )
+ memset(track, 0, sizeof(mk_TrackConfig));
+ switch (audio->config.out.codec & HB_ACODEC_MASK)
{
case HB_ACODEC_DCA:
case HB_ACODEC_DCA_HD: