[FFmpeg-cvslog] avcodec/aac_ac3_parser: fix channel information parsing in case decoder is disabled

Piotr Uracz git at videolan.org
Mon Feb 1 19:02:26 EET 2021


ffmpeg | branch: master | Piotr Uracz <puracz at vewd.com> | Mon Jan 25 12:04:36 2021 +0100| [7ceceee8b6ceed2f5a1d53cde1afefad531b5a78] | committer: Paul B Mahol

avcodec/aac_ac3_parser: fix channel information parsing in case decoder is disabled

Fixes #7372

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ceceee8b6ceed2f5a1d53cde1afefad531b5a78
---

 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;
         }



More information about the ffmpeg-cvslog mailing list