Allow NULL for read_header in AVInputFormat. See discussion in "[PATCH] allow

empty params for av_open_input_stream()".

Originally committed as revision 14059 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 63dd959..794baba 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -394,9 +394,11 @@ int av_open_input_stream(AVFormatContext **ic_ptr,
         ic->priv_data = NULL;
     }
 
+    if (ic->iformat->read_header) {
     err = ic->iformat->read_header(ic, ap);
     if (err < 0)
         goto fail;
+    }
 
     if (pb && !ic->data_offset)
         ic->data_offset = url_ftell(ic->pb);