diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-04-08 06:57:54 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-04-08 09:18:48 +0200 |
commit | a6aa7a1a14dc12d9d745e5d4a8a7feb38eb1c4da (patch) | |
tree | ee6f4a5610b9c2fd4f447ee053b663cfa9fc2866 | |
parent | d6bbe76124c5879099e03754646c4bd70ce5112f (diff) | |
download | ffmpeg-streaming-a6aa7a1a14dc12d9d745e5d4a8a7feb38eb1c4da.zip ffmpeg-streaming-a6aa7a1a14dc12d9d745e5d4a8a7feb38eb1c4da.tar.gz |
applehttp: don't use deprecated url_ functions.
-rw-r--r-- | libavformat/applehttp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c index 6c697c5..243f4a6 100644 --- a/libavformat/applehttp.c +++ b/libavformat/applehttp.c @@ -113,7 +113,7 @@ static void free_variant_list(AppleHTTPContext *c) av_free_packet(&var->pkt); av_free(var->pb.buffer); if (var->input) - url_close(var->input); + ffurl_close(var->input); if (var->ctx) { var->ctx->pb = NULL; av_close_input_file(var->ctx); @@ -291,18 +291,18 @@ reload: goto reload; } - ret = url_open(&v->input, - v->segments[v->cur_seq_no - v->start_seq_no]->url, - AVIO_RDONLY); + ret = ffurl_open(&v->input, + v->segments[v->cur_seq_no - v->start_seq_no]->url, + AVIO_RDONLY); if (ret < 0) return ret; } - ret = url_read(v->input, buf, buf_size); + ret = ffurl_read(v->input, buf, buf_size); if (ret > 0) return ret; if (ret < 0 && ret != AVERROR_EOF) return ret; - url_close(v->input); + ffurl_close(v->input); v->input = NULL; v->cur_seq_no++; @@ -435,7 +435,7 @@ static int recheck_discard_flags(AVFormatContext *s, int first) av_log(s, AV_LOG_INFO, "Now receiving variant %d\n", i); } else if (first && !v->cur_needed && v->needed) { if (v->input) - url_close(v->input); + ffurl_close(v->input); v->input = NULL; v->needed = 0; changed = 1; @@ -517,7 +517,7 @@ static int applehttp_read_seek(AVFormatContext *s, int stream_index, struct variant *var = c->variants[i]; int64_t pos = 0; if (var->input) { - url_close(var->input); + ffurl_close(var->input); var->input = NULL; } av_free_packet(&var->pkt); |