mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'free_as_in_av' into 'master'

Browse source 
Use av_free and maybe get Coverity to understand

See merge request OpenMW/openmw!892
This commit is contained in:
psi29a 2021-05-20 08:21:47 +00:00
commit 3696187737
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
extern/osg-ffmpeg-videoplayer/videostate.cpp vendored
View file

@ -62,6 +62,15 @@ namespace
av_frame_free(&frame);
}
};
template<class T>
struct AVFree
{
void operator()(T* frame) const
{
av_free(&frame);
}
};
}
namespace Video
@ -105,7 +114,7 @@ void VideoState::setAudioFactory(MovieAudioFactory *factory)
void PacketQueue::put(AVPacket *pkt)
{
std::unique_ptr<AVPacketList> pkt1(static_cast<AVPacketList*>(av_malloc(sizeof(AVPacketList))));
std::unique_ptr<AVPacketList, AVFree<AVPacketList>> pkt1(static_cast<AVPacketList*>(av_malloc(sizeof(AVPacketList))));
if(!pkt1) throw std::bad_alloc();
if(pkt == &flush_pkt)
@ -116,14 +125,14 @@ void PacketQueue::put(AVPacket *pkt)
pkt1->next = nullptr;
std::lock_guard<std::mutex> lock(this->mutex);
AVPacketList* ptr = pkt1.release();
if(!last_pkt)
this->first_pkt = pkt1.get();
this->first_pkt = ptr;
else
this->last_pkt->next = pkt1.get();
this->last_pkt = pkt1.release();
this->last_pkt->next = ptr;
this->last_pkt = ptr;
this->nb_packets++;
this->size += this->last_pkt->pkt.size;
this->size += ptr->pkt.size;
this->cond.notify_one();
}