diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 15:55:09 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 15:55:09 +0100 |
| commit | f8e89d8a297e034d03aac88c73acd1541167ae5e (patch) | |
| tree | 036de2728a2748e27d01f273ba431f411eb7b018 /libavformat/sapenc.c | |
| parent | be5fde92ff6cf920e2e7d58a864dcf5527404564 (diff) | |
| parent | fab8156b2f30666adabe227b3d7712fd193873b1 (diff) | |
| download | ffmpeg-f8e89d8a297e034d03aac88c73acd1541167ae5e.tar.gz | |
Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'
* commit 'fab8156b2f30666adabe227b3d7712fd193873b1':
avio: Copy URLContext generic options into child URLContexts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/sapenc.c')
| -rw-r--r-- | libavformat/sapenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c index 0699e3e5b8..3098e340ca 100644 --- a/libavformat/sapenc.c +++ b/libavformat/sapenc.c @@ -151,7 +151,7 @@ static int sap_write_header(AVFormatContext *s) base_port += 2; ret = ffurl_open_whitelist(&fd, url, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL, - s->protocol_whitelist, s->protocol_blacklist); + s->protocol_whitelist, s->protocol_blacklist, NULL); if (ret) { ret = AVERROR(EIO); goto fail; @@ -171,7 +171,7 @@ static int sap_write_header(AVFormatContext *s) "?ttl=%d&connect=1", ttl); ret = ffurl_open_whitelist(&sap->ann_fd, url, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL, - s->protocol_whitelist, s->protocol_blacklist); + s->protocol_whitelist, s->protocol_blacklist, NULL); if (ret) { ret = AVERROR(EIO); goto fail; |