From 9b01a8ad5ecf88aa0a8e52c2b70816e03ef59162 Mon Sep 17 00:00:00 2001 From: "Panagiotis H.M. Issaris" Date: Wed, 14 Dec 2011 17:15:53 +0100 Subject: [PATCH] Prevent segfault if iformat was not yet initialized. Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d84749699a..9fef5201fc 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2809,10 +2809,10 @@ void av_close_input_file(AVFormatContext *s) void avformat_close_input(AVFormatContext **ps) { AVFormatContext *s = *ps; - AVIOContext *pb = (s->iformat->flags & AVFMT_NOFILE) || (s->flags & AVFMT_FLAG_CUSTOM_IO) ? + AVIOContext *pb = (s->iformat && (s->iformat->flags & AVFMT_NOFILE)) || (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb; flush_packet_queue(s); - if (s->iformat->read_close) + if (s->iformat && (s->iformat->read_close)) s->iformat->read_close(s); avformat_free_context(s); *ps = NULL;