[FFmpeg-devel] Start of SCTE-35 support [PATCH]

Michael Niedermayer michael at niedermayer.cc
Fri Jul 8 11:16:52 EEST 2016

On Wed, Jul 06, 2016 at 04:48:30PM -0700, Carlos Fernandez Sanz wrote:
> Hi,
> Apologies for resending - gmail sent the first attempt as a binary attachment.

fatal: corrupt patch at line 14
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Start of SCTE-35 support [PATCH]
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

Breaking DRM is a little like attempting to break through a door even
though the window is wide open and the only thing in the house is a bunch
of things you dont want and which you would get tomorrow for free anyway
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160708/c1370ebb/attachment.sig>

More information about the ffmpeg-devel mailing list