Merge remote-tracking branch 'qatar/master'

[ffmpeg.git] / libavformat / aviobuf.c

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 2f57c55..45a8bad 100644 (file)
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -785,8 +785,12 @@ int avio_open2(AVIOContext **s, const char *filename, int flags,
 
 int avio_close(AVIOContext *s)
 {
 
 int avio_close(AVIOContext *s)
 {

-    URLContext *h = s->opaque;
+    URLContext *h;
+
+    if (!s)
+        return 0;

 
 

+    h = s->opaque;

     av_free(s->buffer);
     av_free(s);
     return ffurl_close(h);
     av_free(s->buffer);
     av_free(s);
     return ffurl_close(h);