summaryrefslogtreecommitdiffstats
path: root/libhb/work.c
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-07-16 21:54:33 +0000
committerjstebbins <[email protected]>2014-07-16 21:54:33 +0000
commit19d357c612955436bc60d67657e60b5e41039991 (patch)
treee10cb041335bd4d0e0ae270ab0281e5b8460aa02 /libhb/work.c
parent8db87cbdc07558cf34fb8c734edf115333cc8719 (diff)
cli: allow user cli options to override defaults for fallback audio encoder
Solves: https://forum.handbrake.fr/viewtopic.php?f=10&t=28074&sid=68d8c5bfffd7081625bcd56fb7c4dad1 git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6236 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/work.c')
-rw-r--r--libhb/work.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/libhb/work.c b/libhb/work.c
index 5c8c38bed..240ccbb92 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -1002,16 +1002,23 @@ static void do_job(hb_job_t *job)
audio->priv.fifo_out = hb_fifo_init(FIFO_LARGE, FIFO_LARGE_WAKE);
audio->priv.fifo_in = hb_fifo_init(FIFO_LARGE, FIFO_LARGE_WAKE);
- /* Passthru audio, nothing to sanitize here */
+ /* Passthru audio */
if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
+ {
+ // Muxer needs these to be set correctly in order to
+ // set audio track MP4 time base.
+ audio->config.out.samples_per_frame =
+ audio->config.in.samples_per_frame;
+ audio->config.out.samplerate = audio->config.in.samplerate;
continue;
+ }
/* Vorbis language information */
if (audio->config.out.codec == HB_ACODEC_VORBIS)
audio->priv.config.vorbis.language = audio->config.lang.simple;
/* sense-check the requested samplerate */
- if (audio->config.out.samplerate < 0)
+ if (audio->config.out.samplerate <= 0)
{
// if not specified, set to same as input
audio->config.out.samplerate = audio->config.in.samplerate;