From patchwork Mon Oct 2 16:26:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5378 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp1699151jan; Mon, 2 Oct 2017 09:27:16 -0700 (PDT) X-Received: by 10.223.158.129 with SMTP id a1mr14295321wrf.65.1506961636868; Mon, 02 Oct 2017 09:27:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506961636; cv=none; d=google.com; s=arc-20160816; b=W+DNRFuXHL2eeh/+CirDy51vJbdd+vTzq75YgW7fUeoQLEzAueCTkvm2cktDCB9fBs vl5XVu/I33QjtVmLezziuHV8jZtTGcnJyHACvlC8x+7SRmTDfGouutTrpYSRIXBo87Hk 73IfYilqgh1XT8siuPtZl2PjOJC8/oZB5JbPNQmpnyimo4aSdMRJt2c/Po9OrAcYyUZM Y6hbWriflncV2Uy3HFxX+7N9q9uLEFKBjlnKYSddAzgK8CXrMuzjDGWhWVfVN1/hRCqA /t/WsJ40JhjvgXHgkzajt09lmoz1vc3G2fFFw1uTE+idypMdfREmrSoH6dDTBY9vuT8o eX1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=Vt0C4zgx8+rNzbqfWrvTDtH5dgdLrdWyeCuaO21scIw=; b=zuJSdnyNJtrmlfHCbb6+dsvHTnoEbiQTHFnMwX3v8TD4hUlhsr/SveHmjE0yL7/5kD q8LIRrdx2a1Q5A1aBSwwDpo0hB6XM+qsPLkzx0HS1oSmZQNMtLegkDfY0RLvwq4SRxSS jJbXptUPkmncYMF2D1Vz59Db22ddZa/pHlnuTCQ93uCL2d/S2TuLLrVy+U3DHqZugWA6 7o41goZEtiRSju5xYc2HIVnRBFuzFQRpQSqtdflu4ZAuqVvEhxjf6SM63M2MmpJdklVH h1/JzoddK3a2xBzk7eU98UbKcpv3ZH/0lDIdNKqYsuLsxbT341BwskzlyAW/sKQUq9fw hLfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NwzcAAh3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s8si379329wrg.494.2017.10.02.09.27.16; Mon, 02 Oct 2017 09:27:16 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NwzcAAh3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 268F5689E9D; Mon, 2 Oct 2017 19:27:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB2EE689C96 for ; Mon, 2 Oct 2017 19:26:54 +0300 (EEST) Received: by mail-qk0-f194.google.com with SMTP id b124so1591864qke.1 for ; Mon, 02 Oct 2017 09:27:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Hz3UhCRk0l6d+K8yDFH4k5+qJpcw69EQsKUTa84Knxk=; b=NwzcAAh3xRoO1emlBrzXcfQwQxnABaZVytsW2t53sY0dOGmvLhrDAoNd5PRh2kmnOz M5IKOEgq389zWWmZ6ejOby14jp3CRw6rc2Fi+NLawPMl+xHJoJLUa35sjaKXPLMA3A7B 4CyAn0aIylblUp0Fg1d8hWyrf17n8na6ZT55k5h+TpdilTUqOZpQdSoGKtrGw9meq+St ia5y/jtoHKkLVza/5QXXWrMxoJvcFxJdF+sucJFW6f9r/mlR/FkBQF/jFzouwmAzQ+6k cvEt/o4Jy+NRF6NVxGEV4Of/vXpSZiLOD4s1534JyU4lf6CN7T0X/i6Ip3zf8tNhdenC sARg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Hz3UhCRk0l6d+K8yDFH4k5+qJpcw69EQsKUTa84Knxk=; b=YXAzRnwwa77A+ghP3VDLR+hWHHgp8R5/h0vtj3zSkG1RwPFS1Sn/W2Ld8iHtdAKYep NnB9/Xn4NmddEBLX4Kyv2G6vqkZBkoB07NPK3hV25fkKx/+l9SuEhk3Niwq6vqu+S4KI A8f4jfFmRjA1KCTWg3y33wc7DpuqIRfL6Iq/ET/gbNe6PdQif/9Am/LRQCvdLbFm1lln iOGXgBJlwOfSVxrpbs95FetqmFIk8x39piKlMh+aOb5Fn57E5a4M+Jobt7ZO62C9MmQO 4aDIbv04gd3v+Z2sIoDOtw3kvqRe66l/sE2ziKuQRjbRDsB2NAYeW9J8vzFp7C32psDv bx5g== X-Gm-Message-State: AMCzsaXKKfEeq9JjnEIzzrAKSVWSwk5kNok8A0+D64KvVT2ZyMYUVxyu ZXqU0tetaNWTS2XtnyjyaRJbgA== X-Google-Smtp-Source: AOwi7QC7YYfHIIeEYiQ4tAH31CuHO9+fRvy4Pjde64z0j2GMwhan8j+tRKVS/HcS9F0/T1CY0O5DLQ== X-Received: by 10.55.23.101 with SMTP id i98mr14845088qkh.193.1506961628189; Mon, 02 Oct 2017 09:27:08 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id x139sm753863qkb.94.2017.10.02.09.27.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Oct 2017 09:27:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Oct 2017 13:26:37 -0300 Message-Id: <20171002162638.5932-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH 1/2 v2] avdevice/decklink_dec: remove av_dup_packet() usage X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- Untested. libavdevice/decklink_dec.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 8a14094474..d8c624aa5d 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -458,16 +458,15 @@ static int avpacket_queue_put(AVPacketQueue *q, AVPacket *pkt) av_log(q->avctx, AV_LOG_WARNING, "Decklink input buffer overrun!\n"); return -1; } - /* duplicate the packet */ - if (av_dup_packet(pkt) < 0) { - return -1; - } - pkt1 = (AVPacketList *)av_malloc(sizeof(AVPacketList)); + pkt1 = (AVPacketList *)av_mallocz(sizeof(AVPacketList)); if (!pkt1) { return -1; } - pkt1->pkt = *pkt; + if (av_packet_ref(&pkt1->pkt, pkt) < 0) { + return -1; + } + av_packet_unref(pkt); pkt1->next = NULL; pthread_mutex_lock(&q->mutex);