diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-05 21:06:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-03 22:46:40 +0200 |
| commit | 8978fedaeefdff50ed4deefbfe822ad07f19f616 (patch) | |
| tree | ffa8b7680649f418f83b1e833e0221749fbb6bdd /ffserver.c | |
| parent | 79997def65fd2313b48a5f3c3a884c6149ae9b5d (diff) | |
| download | ffmpeg-8978fedaeefdff50ed4deefbfe822ad07f19f616.tar.gz | |
avio: introduce an AVIOContext.seekable field
Use it instead of url_is_streamed and AVIOContext.is_streamed.
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ffserver.c b/ffserver.c index 078ee116e1..bc056dd9f0 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2260,7 +2260,7 @@ static int http_prepare_data(HTTPContext *c) /* XXX: potential leak */ return -1; } - c->fmt_ctx.pb->is_streamed = 1; + c->fmt_ctx.pb->seekable = 0; /* * HACK to avoid mpeg ps muxer to spit many underflow errors @@ -2399,7 +2399,7 @@ static int http_prepare_data(HTTPContext *c) } ost = ctx->streams[pkt.stream_index]; - ctx->pb->is_streamed = 1; + ctx->pb->seekable = 0; if (pkt.dts != AV_NOPTS_VALUE) pkt.dts = av_rescale_q(pkt.dts, ist->time_base, ost->time_base); if (pkt.pts != AV_NOPTS_VALUE) @@ -2436,7 +2436,7 @@ static int http_prepare_data(HTTPContext *c) /* XXX: potential leak */ return -1; } - c->fmt_ctx.pb->is_streamed = 1; + c->fmt_ctx.pb->seekable = 0; av_write_trailer(ctx); len = url_close_dyn_buf(ctx->pb, &c->pb_buffer); c->buffer_ptr = c->pb_buffer; @@ -2723,7 +2723,7 @@ static int http_receive_data(HTTPContext *c) pb = avio_alloc_context(c->buffer, c->buffer_end - c->buffer, 0, NULL, NULL, NULL, NULL); - pb->is_streamed = 1; + pb->seekable = 0; if (av_open_input_stream(&s, pb, c->stream->feed_filename, fmt_in, NULL) < 0) { av_free(pb); |