diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-02-19 18:02:45 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-02-22 11:45:31 +0100 |
| commit | 8c0ceafb0f25da077ff23e394667119f031574fd (patch) | |
| tree | c495ca2679de2d9c0bc436652cfb5764cee47905 /libavformat/rtmpproto.c | |
| parent | cae448cfbf31d492cba782bc64fc4eed556ed83d (diff) | |
| download | ffmpeg-8c0ceafb0f25da077ff23e394667119f031574fd.tar.gz | |
urlprotocol: receive a list of protocols from the caller
This way, the decisions about which protocols are available for use in
any given situations can be delegated to the caller.
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index f745c37606..9ed3d0f436 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1119,7 +1119,7 @@ static int rtmp_calc_swfhash(URLContext *s) /* Get the SWF player file. */ if ((ret = ffurl_open(&stream, rt->swfverify, AVIO_FLAG_READ, - &s->interrupt_callback, NULL)) < 0) { + &s->interrupt_callback, NULL, s->protocols)) < 0) { av_log(s, AV_LOG_ERROR, "Cannot open connection %s.\n", rt->swfverify); goto fail; } @@ -2641,7 +2641,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) reconnect: if ((ret = ffurl_open(&rt->stream, buf, AVIO_FLAG_READ_WRITE, - &s->interrupt_callback, &opts)) < 0) { + &s->interrupt_callback, &opts, s->protocols)) < 0) { av_log(s , AV_LOG_ERROR, "Cannot open connection %s\n", buf); goto fail; } |