Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg: release the reader context on destruction.

Browse Source 
* avformat_open_input() is to be balanced with a avformat_close_input().
* should help with #9945.
This commit is contained in:
Jérôme Duval 2013-09-06 23:36:58 +02:00
parent ba654b1b91
commit 8a1f303840
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
View File

@ -238,10 +238,12 @@ StreamBase::StreamBase(BPositionIO* source, BLocker* sourceLock,
StreamBase::~StreamBase() StreamBase::~StreamBase()
{ {
av_free(fIOContext->buffer); if (fContext != NULL)
av_free(fIOContext); avformat_close_input(&fContext);
av_free_packet(&fPacket); av_free_packet(&fPacket);
av_free(fContext); av_free(fContext);
av_free(fIOContext->buffer);
av_free(fIOContext);
} }
@ -263,6 +265,7 @@ StreamBase::Open()
_Seek); _Seek);
if (fIOContext == NULL) { if (fIOContext == NULL) {
TRACE("StreamBase::Open() - avio_alloc_context() failed!\n"); TRACE("StreamBase::Open() - avio_alloc_context() failed!\n");
av_free(buffer);
return B_ERROR; return B_ERROR;
} }
@ -273,6 +276,9 @@ StreamBase::Open()
if (avformat_open_input(&fContext, "", NULL, NULL) < 0) { if (avformat_open_input(&fContext, "", NULL, NULL) < 0) {
TRACE("StreamBase::Open() - avformat_open_input() failed!\n"); TRACE("StreamBase::Open() - avformat_open_input() failed!\n");
// avformat_open_input() frees the context in case of failure // avformat_open_input() frees the context in case of failure
fContext = NULL;
av_free(fIOContext);
fIOContext = NULL;
return B_NOT_SUPPORTED; return B_NOT_SUPPORTED;
} }
@ -1772,5 +1778,3 @@ AVFormatReader::GetNextChunk(void* _cookie, const void** chunkBuffer,
Stream* cookie = reinterpret_cast<Stream*>(_cookie); Stream* cookie = reinterpret_cast<Stream*>(_cookie);
return cookie->GetNextChunk(chunkBuffer, chunkSize, mediaHeader); return cookie->GetNextChunk(chunkBuffer, chunkSize, mediaHeader);
} }