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

avdevice/decklink_dec: use av_packet_make_refcounted to ensure packets are ref counted

Browse Source 
Partially reverts commit e91f0c4f8b, simplifying code.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-03-24 22:28:42 -03:00
parent e61d8b82a2
commit 38fa61b947
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavdevice/decklink_dec.cpp
View File

@ -464,24 +464,22 @@ static unsigned long long avpacket_queue_size(AVPacketQueue *q)
static int avpacket_queue_put(AVPacketQueue *q, AVPacket *pkt) static int avpacket_queue_put(AVPacketQueue *q, AVPacket *pkt)
{ {
AVPacketList *pkt1; AVPacketList *pkt1;
int ret;
// Drop Packet if queue size is > maximum queue size // Drop Packet if queue size is > maximum queue size
if (avpacket_queue_size(q) > (uint64_t)q->max_q_size) { if (avpacket_queue_size(q) > (uint64_t)q->max_q_size) {
av_log(q->avctx, AV_LOG_WARNING, "Decklink input buffer overrun!\n"); av_log(q->avctx, AV_LOG_WARNING, "Decklink input buffer overrun!\n");
return -1; return -1;
} }
/* ensure the packet is reference counted */
if (av_packet_make_refcounted(pkt) < 0) {
return -1;
}
pkt1 = (AVPacketList *)av_mallocz(sizeof(AVPacketList)); pkt1 = (AVPacketList *)av_malloc(sizeof(AVPacketList));
if (!pkt1) { if (!pkt1) {
return -1; return -1;
} }
ret = av_packet_ref(&pkt1->pkt, pkt); av_packet_move_ref(&pkt1->pkt, pkt);
av_packet_unref(pkt);
if (ret < 0) {
av_free(pkt1);
return -1;
}
pkt1->next = NULL; pkt1->next = NULL;
pthread_mutex_lock(&q->mutex); pthread_mutex_lock(&q->mutex);