summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-05-13 22:06:02 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-05-13 22:50:53 +0200
commit6ff2aba08811876bfdc3c7df6f73f47f27b93803 (patch)
treed07c0f14a4729f3a0645ed028e744389b4d77295 /libavformat/utils.c
parentec20b8130269260f3ae1e4642da26ba556814f84 (diff)
avformat/utils: Fix NPD when allocating AVStreamInternal fails
Regression since b9c5fdf6027010d15ee90a43aa023e45a5189097; fixes Coverity ID #1484786. Also remove the check for st->internal->parser as av_parser_close(NULL) is a no-op. Reviewed-by: James Almer <jamrial@gmail.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 492e08562e..fe8eaa6cb3 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4262,13 +4262,11 @@ static void free_stream(AVStream **pst)
av_freep(&st->side_data[i].data);
av_freep(&st->side_data);
- if (st->internal->parser)
- av_parser_close(st->internal->parser);
-
if (st->attached_pic.data)
av_packet_unref(&st->attached_pic);
if (st->internal) {
+ av_parser_close(st->internal->parser);
avcodec_free_context(&st->internal->avctx);
av_bsf_free(&st->internal->bsfc);
av_freep(&st->internal->priv_pts);