diff options
author | Michael Niedermayer <[email protected]> | 2015-08-01 03:00:01 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2015-08-01 03:08:04 +0200 |
commit | 55ea31ab8981716a3ba1d2ae5521e62ff4494791 (patch) | |
tree | 32357f472fffb499f40cc28861881c1d425daf87 /libavformat/aviobuf.c | |
parent | 6d175158e914f042d4dc3a67688456cd0b9d8c62 (diff) | |
parent | 25410c524ddee98c579c7a9ddaf0535278a6dae0 (diff) |
Merge branch 'simple_http_server_api_implementation' of http://git.klaxa.eu/git/ffmpeg
Reviewed-by: Nicolas George <[email protected]>
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/aviobuf.c')
-rw-r--r-- | libavformat/aviobuf.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index aceb3bfcb7..1b3d5f5b80 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1021,6 +1021,23 @@ int avio_read_to_bprint(AVIOContext *h, AVBPrint *pb, size_t max_size) return 0; } +int avio_accept(AVIOContext *s, AVIOContext **c) +{ + int ret; + URLContext *sc = s->opaque; + URLContext *cc = NULL; + ret = ffurl_accept(sc, &cc); + if (ret < 0) + return ret; + return ffio_fdopen(c, cc); +} + +int avio_handshake(AVIOContext *c) +{ + URLContext *cc = c->opaque; + return ffurl_handshake(cc); +} + /* output in a dynamic buffer */ typedef struct DynBuffer { |