From patchwork Mon Oct 2 02:51:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5371 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp1048189jan; Sun, 1 Oct 2017 19:52:40 -0700 (PDT) X-Received: by 10.223.161.23 with SMTP id o23mr14291771wro.103.1506912760648; Sun, 01 Oct 2017 19:52:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506912760; cv=none; d=google.com; s=arc-20160816; b=VcHPvToFKySCLp1SHSISPhTL+p6BEMClJMwl9Vyjzj9/wbOon/U1sRC+Jzsg0MblZD 7zUPcsIWrnaXUWh4uHEX7dYQLKlEkUcL7qtBStwzWf1/FFvVAzTA20sNB3dijzM1A1MZ vxebKTMPMoJT6RP2X6xz/xs5GVHEIPITklwrlr8pX7k/X0aGKfgStulFZjmq+vCxxxFT XnV7Fkyq9ro/BECxb8IIwUJ9nh3P8UFayGQ0IewyjHVvRpFFndhst58H3SEBD7Xiz4L9 +y4nk8n4vaqXobaq+Hikadv4o5Cymj4dnrLC2fdxykTj0bGotcwgeRCqgOZWp2Bpb5Q2 +1nw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=pxpgWU9h15CXSlyvhL4yH9H79BhBMuUfvEGuW/Rbveo=; b=WgPpXSXa3ThZ5GoW8BO8MI9Al6l2Y6Tv1eS6kS5u7+SPfFZvyTNbA5GZRtkJ+UqtBX 1hlaKcUgiyiQamMwR0HIU0BUVjUnS7AP8MlEUdinmQyS6hbu7F9hTK/hVmTX+5apgKck 3SHRLWjArv68rfXJJpPuSppRHYCezIxNVN4BTvvvnb2s9E7sa8Odcrrvt+aImFhGGOb4 DZwXKh+cPqgD9TLJav8Q1+cw9uiV5ZhuG3FfbBerg5R8C1gixH2eZ2Wzh99LSDrnBo8E bmSOEvsU+QXjcjnS9L319zXpg3nzLOBWbn6Go1NACkg3PfeLHIe/wSOR0FSsHl1QHRgr Ka7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HoELLGh6; 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 29si8252204wrz.280.2017.10.01.19.52.40; Sun, 01 Oct 2017 19:52:40 -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=HoELLGh6; 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 1A704689E1C; Mon, 2 Oct 2017 05:52:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 675FD689E0E for ; Mon, 2 Oct 2017 05:52:00 +0300 (EEST) Received: by mail-qt0-f194.google.com with SMTP id f15so5754276qtf.7 for ; Sun, 01 Oct 2017 19:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=Gv5sTOtI/oEZvYJb/KZDcNo5qFiK7g5z1oqq3tX2nQA=; b=HoELLGh6GGYOEe9vrtFrao7B8NOX+QzdLtzW3GESZ/rDqcgvgxQ3HXSRH/K++LeybX qh/3DG44h0l8nHLAI6vFwdA7rh/anvi+ycI2T4gWXJoqyvcVlUxJwxgAqaOtJuNILiW/ LQxG5QAd7LInaBEu3wd3UxuJdsn+WpQ4wYcgwewArf8FbRAcvAemq7cETboT5JCXixPC FsRXittz1gEBR9/0dYkHTeg8XM+MHNeuHiUGyTla/tvPXTLH6ZjB50mqxlHBYbuM4hfS Qpb5ihCl1yFvCKwfLfe+vJ/br9Q/XZJMQN6zjtAmbRfToSE5Ki/zPyT4Y105k+MeEShe zsYQ== 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:in-reply-to :references; bh=Gv5sTOtI/oEZvYJb/KZDcNo5qFiK7g5z1oqq3tX2nQA=; b=jnf0NT7v/m4Rrh70E4Vj9PCWBASOCsuq8C+PnaZyzNyyEUMVeJk2DeMLl3XDIJ3m17 whCDMMU7I90aMlkZgtuNEGUYqiA7au7lv5T1wIFU3tL+d0MGareyTzVIezfioNu5X5ha gX249BI0+L7966myYlX0d6LAx0lPz5jQCj7CXGFx8xtl7EY7SLyqgRAf3Q5l+hZmVlUW PKhYt8vvsIrLACPOEklhQExE1ZGd5sQ3RiIE0EVRHJ5bTemuzhLtMXDB08LodpFfKXKj NIPVNMQnxNdJBqt6Ps7P9PTGay+3kxqiskkWnk4P3UPq9pgsOlfE8lsm640WcKGy7+a1 +wwQ== X-Gm-Message-State: AMCzsaVH8tfAD4yyA0bHm1eDscGWh0RyD2Qx4G8Pt1yMpdPlHhZyYMsQ UGQV/oaNIWiA/6B0iGn5aX3cSA== X-Google-Smtp-Source: AOwi7QAWarFBG/E89R2+Jwzuf+dLVjs8yiQct5Rz8lplt3ZnmQKoWyZvvg60RdKJD5mXnras62pfXw== X-Received: by 10.237.39.135 with SMTP id a7mr17747466qtd.84.1506912733505; Sun, 01 Oct 2017 19:52:13 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id o138sm4039979qke.89.2017.10.01.19.52.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Oct 2017 19:52:13 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Oct 2017 23:51:52 -0300 Message-Id: <20171002025152.5648-3-jamrial@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002025152.5648-1-jamrial@gmail.com> References: <20171002025152.5648-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/decklink_dec: use av_packet_add_side_data() 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" It uses the existing buffer instead of allocating a new one. Signed-off-by: James Almer --- Untested libavdevice/decklink_dec.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 386c64a177..025fee8602 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -390,10 +390,8 @@ uint8_t *get_metadata(AVFormatContext *avctx, uint16_t *buf, size_t width, clear_parity_bits(buf, len); data = vanc_to_cc(avctx, buf, width, data_len); if (data) { - uint8_t *pkt_cc = av_packet_new_side_data(pkt, AV_PKT_DATA_A53_CC, data_len); - if (pkt_cc) - memcpy(pkt_cc, data, data_len); - av_free(data); + if (av_packet_add_side_data(pkt, AV_PKT_DATA_A53_CC, data, data_len) < 0) + av_free(data); } } else { av_log(avctx, AV_LOG_DEBUG, "Unknown meta data DID = 0x%.2x SDID = 0x%.2x\n",