mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-28 05:50:43 +00:00
avdevice/decklink_dec: use av_packet_make_refcounted to ensure packets are ref counted
Partially reverts commit e91f0c4f8b
, simplifying code.
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
e61d8b82a2
commit
38fa61b947
@ -464,24 +464,22 @@ static unsigned long long avpacket_queue_size(AVPacketQueue *q)
|
||||
static int avpacket_queue_put(AVPacketQueue *q, AVPacket *pkt)
|
||||
{
|
||||
AVPacketList *pkt1;
|
||||
int ret;
|
||||
|
||||
// Drop Packet if queue size is > maximum queue size
|
||||
if (avpacket_queue_size(q) > (uint64_t)q->max_q_size) {
|
||||
av_log(q->avctx, AV_LOG_WARNING, "Decklink input buffer overrun!\n");
|
||||
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) {
|
||||
return -1;
|
||||
}
|
||||
ret = av_packet_ref(&pkt1->pkt, pkt);
|
||||
av_packet_unref(pkt);
|
||||
if (ret < 0) {
|
||||
av_free(pkt1);
|
||||
return -1;
|
||||
}
|
||||
av_packet_move_ref(&pkt1->pkt, pkt);
|
||||
pkt1->next = NULL;
|
||||
|
||||
pthread_mutex_lock(&q->mutex);
|
||||
|
Loading…
Reference in New Issue
Block a user