diff --git a/libavformat/utils.c b/libavformat/utils.c
index 23865c88c4..f9d1f1be45 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3808,6 +3808,15 @@ FF_ENABLE_DEPRECATION_WARNINGS
             ret = extract_extradata(st, pkt);
             if (ret < 0)
                 goto find_stream_info_err;
+
+            if (!st->internal->avctx->extradata && st->codecpar->extradata) {
+                av_freep(&avctx->extradata);
+                avctx->extradata = av_mallocz(st->codecpar->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
+                if (!avctx->extradata)
+                    goto find_stream_info_err;
+                memcpy(avctx->extradata, st->codecpar->extradata, st->codecpar->extradata_size);
+                avctx->extradata_size = st->codecpar->extradata_size;
+            }
         }

         /* If still no information, we try to open the codec and to