From 7ceceee8b6ceed2f5a1d53cde1afefad531b5a78 Mon Sep 17 00:00:00 2001 From: Piotr Uracz Date: Mon, 25 Jan 2021 12:04:36 +0100 Subject: [PATCH] avcodec/aac_ac3_parser: fix channel information parsing in case decoder is disabled Fixes #7372 --- libavcodec/aac_ac3_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index e5d4b53339..e84d30aea2 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -89,7 +89,7 @@ get_next: the frame). */ if (avctx->codec_id != AV_CODEC_ID_AAC) { avctx->sample_rate = s->sample_rate; - if (avctx->codec_id != AV_CODEC_ID_EAC3) { + if (!CONFIG_EAC3_DECODER || avctx->codec_id != AV_CODEC_ID_EAC3) { avctx->channels = s->channels; avctx->channel_layout = s->channel_layout; } @@ -99,7 +99,7 @@ get_next: /* Calculate the average bit rate */ s->frame_number++; - if (avctx->codec_id != AV_CODEC_ID_EAC3) { + if (!CONFIG_EAC3_DECODER || avctx->codec_id != AV_CODEC_ID_EAC3) { avctx->bit_rate += (s->bit_rate - avctx->bit_rate) / s->frame_number; }