virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()

Browse Source
This commit is contained in:
Anton Khirnov
2011-04-03 22:55:31 +02:00
parent 724f6a0fa4
commit 8bea72f7eb
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/aviobuf.c
View File

@@ -1136,7 +1136,6 @@ static int64_t dyn_buf_seek(void *opaque, int64_t offset, int whence)
static int url_open_dyn_buf_internal(AVIOContext **s, int max_packet_size) static int url_open_dyn_buf_internal(AVIOContext **s, int max_packet_size)
{ {
DynBuffer *d; DynBuffer *d;
int ret;
unsigned io_buffer_size = max_packet_size ? max_packet_size : 1024; unsigned io_buffer_size = max_packet_size ? max_packet_size : 1024;
if(sizeof(DynBuffer) + io_buffer_size < io_buffer_size) if(sizeof(DynBuffer) + io_buffer_size < io_buffer_size)
@@ -1144,23 +1143,16 @@ static int url_open_dyn_buf_internal(AVIOContext **s, int max_packet_size)
d = av_mallocz(sizeof(DynBuffer) + io_buffer_size); d = av_mallocz(sizeof(DynBuffer) + io_buffer_size);
if (!d) if (!d)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
*s = av_mallocz(sizeof(AVIOContext)); d->io_buffer_size = io_buffer_size;
*s = avio_alloc_context(d->io_buffer, d->io_buffer_size, 1, d, NULL,
max_packet_size ? dyn_packet_buf_write : dyn_buf_write,
max_packet_size ? NULL : dyn_buf_seek);
if(!*s) { if(!*s) {
av_free(d); av_free(d);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
d->io_buffer_size = io_buffer_size;
ret = ffio_init_context(*s, d->io_buffer, io_buffer_size,
1, d, NULL,
max_packet_size ? dyn_packet_buf_write : dyn_buf_write,
max_packet_size ? NULL : dyn_buf_seek);
if (ret == 0) {
(*s)->max_packet_size = max_packet_size; (*s)->max_packet_size = max_packet_size;
} else { return 0;
av_free(d);
av_freep(s);
}
return ret;
} }
int avio_open_dyn_buf(AVIOContext **s) int avio_open_dyn_buf(AVIOContext **s)