oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge tag 'v0.19.11'

Browse Source
This commit is contained in:
Max Kellermann
2015-10-27 11:05:47 +01:00
parent 3882c11450 db9997a106
commit 94f850a588
10 changed files with 106 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/decoder/plugins/FfmpegIo.cxx
View File

@@ -28,7 +28,10 @@
AvioStream::~AvioStream()
{
av_free(io);
if (io != nullptr) {
av_free(io->buffer);
av_free(io);
}
}
inline int
@@ -90,9 +93,18 @@ AvioStream::_Seek(void *opaque, int64_t pos, int whence)
bool
AvioStream::Open()
{
io = avio_alloc_context(buffer, sizeof(buffer),
constexpr size_t BUFFER_SIZE = 8192;
auto buffer = (unsigned char *)av_malloc(BUFFER_SIZE);
if (buffer == nullptr)
return false;
io = avio_alloc_context(buffer, BUFFER_SIZE,
false, this,
_Read, nullptr,
input.IsSeekable() ? _Seek : nullptr);
/* If avio_alloc_context() fails, who frees the buffer? The
libavformat API documentation does not specify this, it
only says that AVIOContext.buffer must be freed in the end,
however no AVIOContext exists in that failure code path. */
return io != nullptr;
}