diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-03-17 10:13:34 +0300 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-04-04 00:46:56 +0400 |
commit | b92c5452822f9f58d33daf933a0d2a5516866bc1 (patch) | |
tree | 8e837202fc801d8f0de5e8be08b691a7d357cde9 /ffserver.c | |
parent | 8978fedaeefdff50ed4deefbfe822ad07f19f616 (diff) |
avio: avio_ prefix for url_open_dyn_buf
Diffstat (limited to 'ffserver.c')
-rw-r--r-- | ffserver.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ffserver.c b/ffserver.c index bc056dd9f0..c4a9ddf10f 100644 --- a/ffserver.c +++ b/ffserver.c @@ -869,7 +869,7 @@ static void close_connection(HTTPContext *c) if (!c->last_packet_sent && c->state == HTTPSTATE_SEND_DATA_TRAILER) { if (ctx->oformat) { /* prepare header */ - if (url_open_dyn_buf(&ctx->pb) >= 0) { + if (avio_open_dyn_buf(&ctx->pb) >= 0) { av_write_trailer(ctx); av_freep(&c->pb_buffer); url_close_dyn_buf(ctx->pb, &c->pb_buffer); @@ -1873,7 +1873,7 @@ static void compute_status(HTTPContext *c) int i, len; AVIOContext *pb; - if (url_open_dyn_buf(&pb) < 0) { + if (avio_open_dyn_buf(&pb) < 0) { /* XXX: return an error ? */ c->buffer_ptr = c->buffer; c->buffer_end = c->buffer; @@ -2256,7 +2256,7 @@ static int http_prepare_data(HTTPContext *c) c->got_key_frame = 0; /* prepare header and save header data in a stream */ - if (url_open_dyn_buf(&c->fmt_ctx.pb) < 0) { + if (avio_open_dyn_buf(&c->fmt_ctx.pb) < 0) { /* XXX: potential leak */ return -1; } @@ -2391,7 +2391,7 @@ static int http_prepare_data(HTTPContext *c) max_packet_size = url_get_max_packet_size(c->rtp_handles[c->packet_stream_index]); ret = url_open_dyn_packet_buf(&ctx->pb, max_packet_size); } else { - ret = url_open_dyn_buf(&ctx->pb); + ret = avio_open_dyn_buf(&ctx->pb); } if (ret < 0) { /* XXX: potential leak */ @@ -2432,7 +2432,7 @@ static int http_prepare_data(HTTPContext *c) return -1; ctx = &c->fmt_ctx; /* prepare header */ - if (url_open_dyn_buf(&ctx->pb) < 0) { + if (avio_open_dyn_buf(&ctx->pb) < 0) { /* XXX: potential leak */ return -1; } @@ -2503,7 +2503,7 @@ static int http_send_data(HTTPContext *c) /* if already sending something, then wait. */ if (rtsp_c->state != RTSPSTATE_WAIT_REQUEST) break; - if (url_open_dyn_buf(&pb) < 0) + if (avio_open_dyn_buf(&pb) < 0) goto fail1; interleaved_index = c->packet_stream_index * 2; /* RTCP packets are sent at odd indexes */ @@ -2850,7 +2850,7 @@ static int rtsp_parse_request(HTTPContext *c) av_strlcpy(c->url, url, sizeof(c->url)); av_strlcpy(c->protocol, protocol, sizeof(c->protocol)); - if (url_open_dyn_buf(&c->pb) < 0) { + if (avio_open_dyn_buf(&c->pb) < 0) { /* XXX: cannot do more */ c->pb = NULL; /* safety */ return -1; |