diff options
| author | maurj <[email protected]> | 2007-03-21 10:09:23 +0000 |
|---|---|---|
| committer | maurj <[email protected]> | 2007-03-21 10:09:23 +0000 |
| commit | 9f205a922d50183e4df041ed24f9398ceacf8769 (patch) | |
| tree | 2420aabdd846b261af990bdb621e2f40f1364f1c /libhb/common.h | |
| parent | df6924eaf9dcc86e19582f3cab91304ec739d63e (diff) | |
Applied and committed saintdev's patch to fix multi-track audio. Only in the CLI for now - the GUI will need updating to reinstate the second audio dropdown.
If the -6 option is specified in the CLI (and faac is specified), then *any* 5.1 tracks specified will be exported as 6-channel AAC.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@438 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/common.h')
| -rw-r--r-- | libhb/common.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/libhb/common.h b/libhb/common.h index d43e5169f..a2be02a87 100644 --- a/libhb/common.h +++ b/libhb/common.h @@ -150,18 +150,8 @@ struct hb_job_s /* Audio tracks: audios: Indexes in hb_title_t's audios list, starting from 0. -1 indicates the end of the list - channels: The # of normal channels in the last used audio - lfechannels: The # of lfe channels in the last used audio - channelsused: The # of channels we will actually use for this job - - calculated based on surround, channels and lfechannels - in work.c - ac3flags: stores the flags from the AC3 source, as found in scan.c surround: 1 if 5.1 should be preserved for AAC, 0 otherwise */ int audios[8]; - int channels; - int lfechannels; - int channelsused; - int ac3flags; int surround; /* Audio settings: @@ -231,12 +221,14 @@ struct hb_audio_s int codec; int rate; int bitrate; - /* indicates the number of normal channels the source audio has */ + /* channels: The # of normal channels in the last used audio + lfechannels: The # of lfe channels in the last used audio + channelsused: The # of channels we will actually use for this job - + calculated based on surround, channels and lfechannels + in work.c */ int channels; - /* indicates the number of lfe channels the source audio has */ int lfechannels; - /* stores the flags from the AC3 source, as found in scan.c */ - int ac3flags; + int channelsused; #ifdef __LIBHB__ /* Internal data */ |