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 2, 2016 at 12:51 PM Felt, Patrickwrote: > 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 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] - cosmetic: the decklink_dec* files are used for input from the decklink cards. update the header to reflect that
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-develon 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 +, 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". 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 [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Avoid a single point of failure, be that a person or equipment. cosmetic.diff Description: cosmetic.diff ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
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 +, 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". > > 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 [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Avoid a single point of failure, be that a person or equipment. signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel