| Message ID | 2B0F89B4-A0A6-4B48-9DD6-E7B0B5F4D5F4@echostar.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Aug 2, 2016 at 12:51 PM Felt, Patrick <Patrick.Felt@echostar.com> wrote: > 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). > Pushed, thanks. Timothy
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 [...]
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 <ffmpeg-devel-bounces@ffmpeg.org> on behalf of Michael Niedermayer <michael@niedermayer.cc> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Date: Tuesday, August 2, 2016 at 1:08 PM To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> 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.