summaryrefslogtreecommitdiffstats
path: root/gtk/src
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-06-27 07:13:13 +0000
committerjstebbins <[email protected]>2011-06-27 07:13:13 +0000
commit36d97e89367de3aa8c430f11c338966646081fdd (patch)
tree56c569c7044d2636e01df520b3dd484ec1e56c5a /gtk/src
parent631a9de8e479f31495ae4665a5e6796850247769 (diff)
LinGui: fix a problem with enabling dts and dts-hd passthru in audio options
audio_config.in.codec in these cases is HB_ACODEC_DTS* | HB_ACODEC_FF_I_FLAG. I was not masking off the FF_I_FLAG when checking the input codec. Note, that this problem goes away in the RB patch that cleans up ffmpeg hacks, the FF_I_FLAG being one such hack. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4078 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
-rw-r--r--gtk/src/hb-backend.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index e643dea44..8a90d4ece 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -1577,15 +1577,15 @@ ghb_grey_combo_options(GtkBuilder *builder)
grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA_HD_PASS, TRUE);
}
- if (aconfig && aconfig->in.codec != HB_ACODEC_AC3)
+ if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_AC3)
{
grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_AC3_PASS, TRUE);
}
- if (aconfig && aconfig->in.codec != HB_ACODEC_DCA)
+ if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_DCA)
{
grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA_PASS, TRUE);
}
- if (aconfig && aconfig->in.codec != HB_ACODEC_DCA_HD)
+ if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_DCA_HD)
{
grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA_HD_PASS, TRUE);
}
@@ -4257,7 +4257,7 @@ ghb_validate_audio(signal_user_data_t *ud)
}
g_free(message);
if ((codec & HB_ACODEC_AC3) ||
- aconfig->in.codec == HB_ACODEC_DCA)
+ (aconfig->in.codec & HB_ACODEC_MASK) == HB_ACODEC_DCA)
{
codec = HB_ACODEC_AC3;
}