virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avio: don't replicate avio_alloc_context functionality.

Browse Source
This commit is contained in:
Anton Khirnov 2011-05-21 19:13:22 +02:00
parent e3bc07f4af
commit c3bec4cd13
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/aviobuf.c
View File

@ -838,19 +838,12 @@ int ffio_fdopen(AVIOContext **s, URLContext *h)
if (!buffer) if (!buffer)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
*s = av_mallocz(sizeof(AVIOContext)); *s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE, h,
if(!*s) { ffurl_read, ffurl_write, ffurl_seek);
if (!*s) {
av_free(buffer); av_free(buffer);
return AVERROR(ENOMEM); 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 #if FF_API_OLD_AVIO
(*s)->is_streamed = h->is_streamed; (*s)->is_streamed = h->is_streamed;
#endif #endif