virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avio: deprecate url_open_buf

Browse Source 
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>
This commit is contained in:
Anton Khirnov 2011-03-14 20:39:04 +01:00 committed by Ronald S. Bultje
parent eda4cf92d7
commit 83fddaeb81
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ffserver.c
View File

@ -2721,7 +2721,8 @@ static int http_receive_data(HTTPContext *c)
if (!fmt_in) if (!fmt_in)
goto fail; 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; pb->is_streamed = 1;
if (av_open_input_stream(&s, pb, c->stream->feed_filename, fmt_in, NULL) < 0) { if (av_open_input_stream(&s, pb, c->stream->feed_filename, fmt_in, NULL) < 0) {

4
libavformat/avio.h
View File

@ -629,9 +629,9 @@ URLContext *url_fileno(AVIOContext *s);
* @deprecated use AVIOContext.max_packet_size directly. * @deprecated use AVIOContext.max_packet_size directly.
*/ */
attribute_deprecated int url_fget_max_packet_size(AVIOContext *s); 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 */ /** return the written or read size */
int url_close_buf(AVIOContext *s); int url_close_buf(AVIOContext *s);

2
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. */ * back to the server even if CONFIG_MUXERS is false. */
#if CONFIG_MUXERS || CONFIG_NETWORK #if CONFIG_MUXERS || CONFIG_NETWORK
/* buffer handling */ /* buffer handling */
#if FF_API_OLD_AVIO
int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags) int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags)
{ {
int ret; int ret;
@ -1009,6 +1010,7 @@ int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags)
av_freep(s); av_freep(s);
return ret; return ret;
} }
#endif
int url_close_buf(AVIOContext *s) int url_close_buf(AVIOContext *s)
{ {