diff options
| author | John Stebbins <[email protected]> | 2017-11-10 10:18:09 -0800 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2017-11-10 10:18:09 -0800 |
| commit | 2a5df5af77d559f66355c984a56a7932260b0ceb (patch) | |
| tree | 07fcf59c48bda61b7d39a5a490c2cab8644d3b8c /libhb | |
| parent | 463010d8505798e77cd8330ee889e8b4914fd562 (diff) | |
presets: fix selection of audio tracks
The new audio attributes were not checked correctly and filtered out any
audio tracks that had the DEFAULT flag.
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/common.h | 3 | ||||
| -rw-r--r-- | libhb/preset.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libhb/common.h b/libhb/common.h index 7e0a6f31b..dcd4640ac 100644 --- a/libhb/common.h +++ b/libhb/common.h @@ -749,6 +749,9 @@ struct hb_job_s #define HB_AUDIO_ATTR_ALT_COMMENTARY 0x08 #define HB_AUDIO_ATTR_SECONDARY 0x10 #define HB_AUDIO_ATTR_DEFAULT 0x20 +// This mask should contain all attributes that are allowed for default +// audio track selection +#define HB_AUDIO_ATTR_REGULAR_MASK 0x21 // Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio_config_s.cs when changing this struct struct hb_audio_config_s diff --git a/libhb/preset.c b/libhb/preset.c index 8aecdccff..2d05b1c72 100644 --- a/libhb/preset.c +++ b/libhb/preset.c @@ -405,7 +405,7 @@ static int find_audio_track(const hb_title_t *title, // allow any audio track type if ((behavior == 2 || audio->lang.attributes == HB_AUDIO_ATTR_NONE || - audio->lang.attributes == HB_AUDIO_ATTR_NORMAL) && + (audio->lang.attributes & HB_AUDIO_ATTR_REGULAR_MASK)) && (!strcmp(lang, audio->lang.iso639_2) || !strcmp(lang, "und"))) { return ii; |