diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c
index abedfdb066..71497876ac 100644
--- a/libavformat/iamf_parse.c
+++ b/libavformat/iamf_parse.c
@@ -285,10 +285,11 @@ static int update_extradata(AVCodecParameters *codecpar)
         AV_WL16A(codecpar->extradata + 16, AV_RB16A(codecpar->extradata + 16)); // Byte swap Output Gain
         break;
     case AV_CODEC_ID_AAC: {
-        uint8_t buf[5];
+        uint8_t buf[6];
+        int size = FFMIN(codecpar->extradata_size, sizeof(buf));
 
-        init_put_bits(&pb, buf, sizeof(buf));
-        ret = init_get_bits8(&gb, codecpar->extradata, codecpar->extradata_size);
+        init_put_bits(&pb, buf, size);
+        ret = init_get_bits8(&gb, codecpar->extradata, size);
         if (ret < 0)
             return ret;
 
@@ -304,6 +305,10 @@ static int update_extradata(AVCodecParameters *codecpar)
         skip_bits(&gb, 4);
         put_bits(&pb, 4, codecpar->ch_layout.nb_channels); // set channel config
         ret = put_bits_left(&pb);
+        while (ret >= 32) {
+           put_bits32(&pb, get_bits_long(&gb, 32));
+           ret -= 32;
+        }
         put_bits(&pb, ret, get_bits_long(&gb, ret));
         flush_put_bits(&pb);