From patchwork Tue Jan 9 01:16:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 7219 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp3317814jaa; Mon, 8 Jan 2018 17:18:14 -0800 (PST) X-Google-Smtp-Source: ACJfBotn/4pUERRuDodx2MaCXcvR9FYCz5MFzUpbWUYemLQ2zUoCXpjtl444SIy2kKPfyAOBzbwj X-Received: by 10.28.209.137 with SMTP id i131mr48281wmg.1.1515460694492; Mon, 08 Jan 2018 17:18:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515460694; cv=none; d=google.com; s=arc-20160816; b=MQAdoKzjSjZFySmpXE1zdikcN5QdK5sIjdvNcrGHRpfO+0lXeYYjUKJFRjb2gSz0Yh 3ph0yoHUJ3GaxiLZnCglkCaPctz7AUE9hUF39rKTVbKvqP9qaluhZF56X+WclFZa7I26 0lXmt79bgsXe//JmcPCOEewyKSuW+M9qyGPSNdBQP5k/N7/s4yLz9g3Uigd3aMl7iWb+ L65HR1zqzRwtk8qZ7gIOfFG+XTunzm0+pbMunIMirEasyXIwPXKiXOYnqS99WtcFDvkm 0ufluIv+IjJjEsrQBswpnJDf/6eGtV/GpMnR5PNirC7TB6bRTPOrgwJ8kvvkFHplhTM7 spwA== 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:cc: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:delivered-to:arc-authentication-results; bh=vTLZAnagJWkD6+ZMCSSsmUrBFEb5sUNnyjKKSfagQho=; b=f0w9tH2o4wds3yPPnch7O8lefQNlq7RsATdxhdxFWWLUsIdQ2PYkH6XaZ4IN5UrHa+ pTu19Vc1vZQkqvrdN3B/NIEGO3SjgnMA92CV/R9daD6jd12vXnhDeMemLyMgCRkcjrnE U6HKtKARg7DXLRvQoaohLQl5Qwrm80LnIgfHmtozwzukBJ66YSbmnYc9+gia8IzjM23g IoMXm/NlvEfcl1tSi+m/bHgwwZO+q+WxNQaDshVnV6qsXCQJhp0j/yDC6PztmakhDHW3 iIF9jCczCHW4vgdevV9Yu7trymTOZH9GhqlDb3U+NMUq3dciWb1wpO0qi4B/Ye8t2Nhg 2c3Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 37si1657212wrb.8.2018.01.08.17.18.14; Mon, 08 Jan 2018 17:18:14 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B33E068A094; Tue, 9 Jan 2018 03:17:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from was-smtp1.livetimenet.net (50-206-97-56-static.hfc.comcastbusiness.net [50.206.97.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6D3068A070 for ; Tue, 9 Jan 2018 03:17:21 +0200 (EET) Received: by was-smtp1.livetimenet.net with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.84_2) (envelope-from ) id 1eYiXZ-0008Fd-24; Mon, 08 Jan 2018 20:17:22 -0500 From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jan 2018 20:16:51 -0500 Message-Id: <20180109011658.72370-5-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180109011658.72370-1-dheitmueller@ltnglobal.com> References: <20180109011658.72370-1-dheitmueller@ltnglobal.com> X-Spam-Score: -1.9 (-) Subject: [FFmpeg-devel] [PATCH 04/11] Preserve AFD side data when going from AVPacket to AVFrame 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 Cc: jgreen@ltnglobal.com, Devin Heitmueller MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is needed to ensure that AFD data continues to work when capturing V210 video with the Decklink libavdevice input. Signed-off-by: Devin Heitmueller --- libavcodec/decode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index f67b214..14660ac 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1667,6 +1667,7 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, { AV_PKT_DATA_A53_CC, AV_FRAME_DATA_A53_CC }, + { AV_PKT_DATA_AFD, AV_FRAME_DATA_AFD }, }; if (pkt) {