Browse Source

avio: deprecate url_open_buf

It's only used in one place and does the same thing as
avio_alloc_context.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
tags/n0.8
Anton Khirnov Ronald S. Bultje 14 years ago
parent
commit
83fddaeb81
3 changed files with 6 additions and 3 deletions
  1. +2
    -1
      ffserver.c
  2. +2
    -2
      libavformat/avio.h
  3. +2
    -0
      libavformat/aviobuf.c

+ 2
- 1
ffserver.c View File

@@ -2721,7 +2721,8 @@ static int http_receive_data(HTTPContext *c)
if (!fmt_in)
goto fail;

url_open_buf(&pb, c->buffer, c->buffer_end - c->buffer, URL_RDONLY);
pb = avio_alloc_context(c->buffer, c->buffer_end - c->buffer,
0, NULL, NULL, NULL, NULL);
pb->is_streamed = 1;

if (av_open_input_stream(&s, pb, c->stream->feed_filename, fmt_in, NULL) < 0) {


+ 2
- 2
libavformat/avio.h View File

@@ -629,9 +629,9 @@ URLContext *url_fileno(AVIOContext *s);
* @deprecated use AVIOContext.max_packet_size directly.
*/
attribute_deprecated int url_fget_max_packet_size(AVIOContext *s);
#endif

int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags);
attribute_deprecated int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags);
#endif

/** return the written or read size */
int url_close_buf(AVIOContext *s);


+ 2
- 0
libavformat/aviobuf.c View File

@@ -996,6 +996,7 @@ int64_t av_url_read_fseek(AVIOContext *s, int stream_index,
* back to the server even if CONFIG_MUXERS is false. */
#if CONFIG_MUXERS || CONFIG_NETWORK
/* buffer handling */
#if FF_API_OLD_AVIO
int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags)
{
int ret;
@@ -1009,6 +1010,7 @@ int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags)
av_freep(s);
return ret;
}
#endif

int url_close_buf(AVIOContext *s)
{


Loading…
Cancel
Save