summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libhb/encfaac.c2
-rw-r--r--test/test.c9
2 files changed, 9 insertions, 2 deletions
diff --git a/libhb/encfaac.c b/libhb/encfaac.c
index 3cbe48f24..84e1fcbaf 100644
--- a/libhb/encfaac.c
+++ b/libhb/encfaac.c
@@ -74,7 +74,7 @@ int encfaacInit( hb_work_object_t * w, hb_job_t * job )
}
cfg->useTns = 0;
- cfg->bitRate = job->abitrate * 500; /* Per channel */
+ cfg->bitRate = job->abitrate * 1000 / w->config->aac.channelsused; /* Per channel */
cfg->bandWidth = 0;
cfg->outputFormat = 0;
cfg->inputFormat = FAAC_INPUT_FLOAT;
diff --git a/test/test.c b/test/test.c
index 38e58a23d..bc6b51ab0 100644
--- a/test/test.c
+++ b/test/test.c
@@ -963,7 +963,14 @@ static int CheckOptions( int argc, char ** argv )
{
/* only attempt 5.1 export if exporting to AAC */
surround = 0;
- }
+ } else {
+ if (!abitrate && surround)
+ {
+ /* If we don't get a audio bitrate on the command line, and
+ surround is being used, default to 384 */
+ abitrate = 384;
+ }
+ }
}