diff options
| author | Martin Storsjö <martin@martin.st> | 2011-11-06 23:03:45 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-11-13 13:17:04 +0100 |
| commit | 1dee0aca7401fc6c01f23ceedaff6533efb0fb28 (patch) | |
| tree | dbd6104edaaf97d9b48d84cc9ee75ca1747d48e3 /libavformat/avio.c | |
| parent | ddffc2fdc351d60ca190b016cccff4acff27823f (diff) | |
| download | ffmpeg-1dee0aca7401fc6c01f23ceedaff6533efb0fb28.tar.gz | |
avio: add avio_open2, taking an interrupt callback and options
The interrupt callback has to be passed in during opening (setting it
after opening isn't enough), since a blocking open couldn't be
interrupted otherwise.
Options are passed down to procotols and also need to be available
during open() in most cases.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/avio.c')
| -rw-r--r-- | libavformat/avio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 330d52cfec..9de435e073 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -73,7 +73,7 @@ static const AVClass *urlcontext_child_class_next(const AVClass *prev) } static const AVOption options[] = {{NULL}}; -static const AVClass urlcontext_class = { +const AVClass ffurl_context_class = { .class_name = "URLContext", .item_name = urlcontext_to_name, .option = options, @@ -135,7 +135,7 @@ static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up, err = AVERROR(ENOMEM); goto fail; } - uc->av_class = &urlcontext_class; + uc->av_class = &ffurl_context_class; uc->filename = (char *) &uc[1]; strcpy(uc->filename, filename); uc->prot = up; |