diff --git a/libavformat/utils.c b/libavformat/utils.c
index 973ab94d6f..73e3039421 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2535,6 +2535,11 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c)
     }
 
     st->codec = avcodec_alloc_context3(c);
+    if (!st->codec) {
+        av_free(st->info);
+        av_free(st);
+        return NULL;
+    }
     if (s->iformat) {
         /* no default bitrate if decoding */
         st->codec->bit_rate = 0;