From patchwork Mon Oct 2 16:26:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5379 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp1699274jan; Mon, 2 Oct 2017 09:27:24 -0700 (PDT) X-Received: by 10.28.65.213 with SMTP id o204mr11464632wma.139.1506961644139; Mon, 02 Oct 2017 09:27:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506961644; cv=none; d=google.com; s=arc-20160816; b=j1NcSm0CZK8yVbAp5GSAkP3fySegUaoGUtaOSgdtd6Le76EbW8454xb6ZADcM7LwN+ oeEa1nhVpiv0feI/DK0It3r2us0w3ycadnTkW+x5LbP9/6h/jalVCHtdVyl2SWUcSzsq 61VFR5ix/kIQy7YgFkAXu4ED9LEzU6yxrB3dalomv/bJ3IRSDk6Vz6mXY44qB9uJOHkG NTV5eEgSMLvV2SctM5nNYvG4rJOwnMf7YkOqqn5g40VhEpEF2U08ADVvNul2NpbJAF4L htQ/5mZDj1NeoNs1eZtfew//Z87eS2Qw+H3REEn05BiXmLTCqb4GitnYLR1dtmF44KA2 JWDg== 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=aXp4iVWIHJyFQBG87hz6+xtuO3InPL9iQe1SxlQ5VEg=; b=kJv8y8IIrS/y/kTB/k1Nbuibn6ZeiVlpa2XC7R5ela2C21ZgwhC6SY8xOa0ElvklIL KMelfluNK2CaLdIPdVIVJExDmOO8YS2dxzr0/kbSbTiYuCtpISFrCjYV7KRkzjj0zQTN O5ZZjtC+GHBY4Ao1BqS6+UGcLJ6fbyL8kIEcvxNAkn+Q0QEVwLbThhDts2y90YKWMDY8 KwyceyXVSPb1fxeq9BXzYfhi4G8hHjLtT/VoYY4AEZ+SOObWEC3FM4jVcP0G7vwuUBQn 2ZHJNu8m2OdIUP4HYk9NxkPZGuTVmqjOUL1GyFNQ11iF3w4SBTPZYge0NToHqcy35Tho Ve2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PpA8o2lf; 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 q1si3533429wmg.236.2017.10.02.09.27.23; Mon, 02 Oct 2017 09:27:24 -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=PpA8o2lf; 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 89FCE689EAE; Mon, 2 Oct 2017 19:27:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DF46689E92 for ; Mon, 2 Oct 2017 19:26:56 +0300 (EEST) Received: by mail-qt0-f193.google.com with SMTP id i13so7951895qtc.11 for ; Mon, 02 Oct 2017 09:27:10 -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=dz7DTM7cKopnvboJRWykCNMU9UsYqEaDkEc7oh8dzbg=; b=PpA8o2lfnz71yckiQHMp0SN9KvFyf2f6SB6I//IdA2vNkBNMC8mpQr9jgNjr/lOfgY IW8DfdEvqVMu5dbFQaN1LkOAnTzPRRBUV4X1z7UtUFJt0B0t5FrAow9vmAYoncXp6wWz VlmzSQBBZPvxg0kl4FEzlTWNZURzK3QMFONKgC6Nzt/H1sEpSlLDlZpy7Dakv6WsBdS2 EJrtM2Jpp8TURdj0DfhEuEjVoQaAZd87sSqWxxlUg+u72HnrxmtA69zNz027eqD/lOpT x4JT7GIMLjXtIOdgBZJ8RSKAJ3uHs6+Ncm1TxNRxACpqwSMopl+mmk1F3keZP4MTcoB0 vzyQ== 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=dz7DTM7cKopnvboJRWykCNMU9UsYqEaDkEc7oh8dzbg=; b=uDGdlZsE/Y60tx5dG9w8ncAd0vxDeyjCKUicCsqfEkaASK9AhHD2rozILUrdFdgkjQ Vp9LJoiPKv0M7+k5CR7w9tDa9nsFmlRsnhq+HgrlLujlwzZWj4f3xZ84MfH79n3/SDZ9 gB1mhSDjiZvpaB31UTrtyGYMIYu5ULzuhn5H5NrHdeO1ut4pn8Ue84VnPDWiKJ8RufeJ VzD/pkvoV8Dmi3xK9X7wc4S9w28wE8FX2F8uIdOrFSFktUxkJYL4EFASjKdUL6Q9PF+6 khSudeeiyI+3o2sul0Rw1bIgpUPc2Tscxzzl8ee6X4IqbRZ/piMDH26otdyCSIYepTN4 zAcw== X-Gm-Message-State: AMCzsaU2fefA76Yu4GXEVEEGfh5NsKPYg98Y0FSLAZh4Yo069GVeLTYd 7lA16oU/eYu3hmyq20rVoF62lQ== X-Google-Smtp-Source: AOwi7QAEglv2l3mUoElFLPlQ0EtxLs2ufnL6bdnpvt5gzpFtJ8kclLBJgaOWhrMkAfjSt1Faujj7Qw== X-Received: by 10.237.39.219 with SMTP id m27mr19631854qtg.34.1506961629398; Mon, 02 Oct 2017 09:27:09 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id x139sm753863qkb.94.2017.10.02.09.27.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Oct 2017 09:27:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Oct 2017 13:26:38 -0300 Message-Id: <20171002162638.5932-2-jamrial@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002162638.5932-1-jamrial@gmail.com> References: <20171002162638.5932-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2 v2] avdevice/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. No changes since last version. 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 d8c624aa5d..a172110bdd 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",