Module: libav Branch: master Commit: c3bec4cd1391c7f2ca0e98713e3721d0336b49c4
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Sat May 21 19:13:22 2011 +0200 avio: don't replicate avio_alloc_context functionality. --- libavformat/aviobuf.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index fa63ddf..b5e9d4c 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -838,19 +838,12 @@ int ffio_fdopen(AVIOContext **s, URLContext *h) if (!buffer) return AVERROR(ENOMEM); - *s = av_mallocz(sizeof(AVIOContext)); - if(!*s) { + *s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE, h, + ffurl_read, ffurl_write, ffurl_seek); + if (!*s) { av_free(buffer); return AVERROR(ENOMEM); } - - if (ffio_init_context(*s, buffer, buffer_size, - h->flags & AVIO_FLAG_WRITE, h, - ffurl_read, ffurl_write, ffurl_seek) < 0) { - av_free(buffer); - av_freep(s); - return AVERROR(EIO); - } #if FF_API_OLD_AVIO (*s)->is_streamed = h->is_streamed; #endif _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
