From patchwork Tue Aug 2 19:51:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Felt, Patrick" X-Patchwork-Id: 70 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp371973vsd; Tue, 2 Aug 2016 12:51:30 -0700 (PDT) X-Received: by 10.28.63.21 with SMTP id m21mr66218483wma.77.1470167490769; Tue, 02 Aug 2016 12:51:30 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fn7si4144166wjc.190.2016.08.02.12.51.30; Tue, 02 Aug 2016 12:51:30 -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; 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 DC09B689FA0; Tue, 2 Aug 2016 22:51:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from chapzsmtp1.echostar.com (mail01.echostar.com [139.85.4.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3DA55689D09 for ; Tue, 2 Aug 2016 22:51:08 +0300 (EEST) Received: from mail.echostar.com (unknown [10.182.50.87]) by Websense Email Security Gateway with ESMTPS id C9200E7C6928E for ; Tue, 2 Aug 2016 13:51:12 -0600 (MDT) Received: from CHWPIEXC11.SATS.CORP ([fe80::fd70:649a:c315:9a1d]) by CHWPIEXC10.SATS.CORP ([fe80::f0a2:1f1e:2622:88a6%21]) with mapi id 14.03.0279.002; Tue, 2 Aug 2016 13:51:13 -0600 From: "Felt, Patrick" To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH] - cosmetic: the decklink_dec* files are used for input from the decklink cards. update the header to reflect that Thread-Index: AQHR7Pc4zvk1ttis9EOdsEOiACK7qg== Date: Tue, 2 Aug 2016 19:51:12 +0000 Message-ID: <2B0F89B4-A0A6-4B48-9DD6-E7B0B5F4D5F4@echostar.com> References: <20160802190822.GS5460@nb4> In-Reply-To: <20160802190822.GS5460@nb4> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.182.31.10] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] - cosmetic: the decklink_dec* files are used for input from the decklink cards. update the header to reflect that 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" That’s really odd. Has to be something stupid from my MUA. Let me attach it as a file and it should go. (I wrote this off a brand new fresh clone). From: ffmpeg-devel on behalf of Michael Niedermayer Reply-To: FFmpeg development discussions and patches Date: Tuesday, August 2, 2016 at 1:08 PM To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] - cosmetic: the decklink_dec* files are used for input from the decklink cards. update the header to reflect that On Tue, Aug 02, 2016 at 06:44:14PM +0000, Felt, Patrick wrote: This is a cosmetic patch only to update the header of decklink files to be indicative of data flow direction. --- libavdevice/decklink_dec.cpp | 4 ++-- libavdevice/decklink_dec.h | 2 +- libavdevice/decklink_dec_c.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) Applying: - cosmetic: the decklink_dec* files are used for input from the decklink cards. update the header to reflect that fatal: corrupt patch at line 12 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 - cosmetic: the decklink_dec* files are used for input from the decklink cards. update the header to reflect that When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Avoid a single point of failure, be that a person or equipment. diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index fcb024e..fc81d4d 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -1,5 +1,5 @@ /* - * Blackmagic DeckLink output patch is oddly corrupted here [...]