diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2008-07-03 12:10:54 +0000 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2008-07-03 12:10:54 +0000 |
commit | e145ce202757dc4654c3e07e3f788dc385016074 (patch) | |
tree | d148690895620bb022b54247885b5383921e5421 /libavformat/utils.c | |
parent | 4f0689b528c2a2a6a77063742acdaede09025421 (diff) | |
download | ffmpeg-streaming-e145ce202757dc4654c3e07e3f788dc385016074.zip ffmpeg-streaming-e145ce202757dc4654c3e07e3f788dc385016074.tar.gz |
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
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 63dd959..794baba 100644 --- 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); |