diff options
| -rw-r--r-- | libhb/decavcodec.c | 2 | ||||
| -rw-r--r-- | libhb/hb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c index 3c88be7ed..fd58c5c28 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -215,7 +215,7 @@ static int decavcodecaInit( hb_work_object_t * w, hb_job_t * job ) } else if( ( !pv->context->channels || !pv->context->channel_layout ) && ( w->audio->config.in.codec == HB_ACODEC_DCA_HD ) && - ( ( w->audio->config.in.channel_layout & HB_INPUT_CH_LAYOUT_3F2R ) == HB_INPUT_CH_LAYOUT_3F2R ) ) + ( ( w->audio->config.in.channel_layout & ~HB_INPUT_CH_LAYOUT_HAS_LFE ) == HB_INPUT_CH_LAYOUT_3F2R ) ) { /* XXX: when we are demuxing the stream ourselves, it seems we have no * channel count/layout info in the context until we decode audio for diff --git a/libhb/hb.c b/libhb/hb.c index 90e6916ff..31456784f 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -306,7 +306,7 @@ void hb_ff_set_sample_fmt(AVCodecContext *context, AVCodec *codec) int hb_ff_dts_disable_xch( AVCodecContext *c ) { if( ( c->codec_id == CODEC_ID_DTS ) && - ( c->channel_layout & ( AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER ) ) ) + ( ( c->channel_layout & ~AV_CH_LOW_FREQUENCY ) == ( AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER ) ) ) { c->request_channels = --c->channels; c->channel_layout &= ~AV_CH_BACK_CENTER; |