From 2b1324bd167553f49736e4eaa94f96da9982925e Mon Sep 17 00:00:00 2001 From: wm4 <nfxjfg@googlemail.com> Date: Sun, 16 Jul 2017 12:43:09 +0200 Subject: [PATCH] lavf: allow avformat_close_input() with NULL This is consistent with how other destructors behave. Signed-off-by: Anton Khirnov <anton@khirnov.net> --- libavformat/utils.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index eaba4739140..bbdc2cdb8ab 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2733,7 +2733,12 @@ void avformat_free_context(AVFormatContext *s) void avformat_close_input(AVFormatContext **ps) { AVFormatContext *s = *ps; - AVIOContext *pb = s->pb; + AVIOContext *pb; + + if (!*ps) + return; + + pb = s->pb; if ((s->iformat && s->iformat->flags & AVFMT_NOFILE) || (s->flags & AVFMT_FLAG_CUSTOM_IO)) -- GitLab