diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 17:55:09 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 17:55:09 +0300 |
| commit | f8e89d8a297e034d03aac88c73acd1541167ae5e (patch) | |
| tree | 036de2728a2748e27d01f273ba431f411eb7b018 /libavformat/smoothstreamingenc.c | |
| parent | be5fde92ff6cf920e2e7d58a864dcf5527404564 (diff) | |
| parent | fab8156b2f30666adabe227b3d7712fd193873b1 (diff) | |
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/smoothstreamingenc.c')
| -rw-r--r-- | libavformat/smoothstreamingenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 193c360db1..dabd1ea304 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -123,7 +123,7 @@ static int64_t ism_seek(void *opaque, int64_t offset, int whence) os->tail_out = os->out; av_dict_set(&opts, "truncate", "0", 0); ret = ffurl_open_whitelist(&os->out, frag->file, AVIO_FLAG_WRITE, - &os->ctx->interrupt_callback, &opts, os->ctx->protocol_whitelist, os->ctx->protocol_blacklist); + &os->ctx->interrupt_callback, &opts, os->ctx->protocol_whitelist, os->ctx->protocol_blacklist, NULL); av_dict_free(&opts); if (ret < 0) { os->out = os->tail_out; @@ -132,7 +132,7 @@ static int64_t ism_seek(void *opaque, int64_t offset, int whence) } av_dict_set(&opts, "truncate", "0", 0); ffurl_open_whitelist(&os->out2, frag->infofile, AVIO_FLAG_WRITE, - &os->ctx->interrupt_callback, &opts, os->ctx->protocol_whitelist, os->ctx->protocol_blacklist); + &os->ctx->interrupt_callback, &opts, os->ctx->protocol_whitelist, os->ctx->protocol_blacklist, NULL); av_dict_free(&opts); ffurl_seek(os->out, offset - frag->start_pos, SEEK_SET); if (os->out2) @@ -526,7 +526,7 @@ static int ism_flush(AVFormatContext *s, int final) continue; snprintf(filename, sizeof(filename), "%s/temp", os->dirname); - ret = ffurl_open_whitelist(&os->out, filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL, s->protocol_whitelist, s->protocol_blacklist); + ret = ffurl_open_whitelist(&os->out, filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL, s->protocol_whitelist, s->protocol_blacklist, NULL); if (ret < 0) break; os->cur_start_pos = os->tail_pos; |