[FFmpeg-devel] libavfilter/unsharpen: patch fixes and resubmission

[Michael Niedermayer]

On Tue, Dec 23, 2014 at 09:26:04PM +0000, Titov, Alexey wrote:
> Hi,
> 
> I've fixed the patch according to the reviewers suggestions. Attached are the two patches (original and fixes)

Applying: libavfilter/unsharpen: patch fixes and resubmission
fatal: corrupt patch at line 29
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 libavfilter/unsharpen: patch fixes and resubmission
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

Opposition brings concord. Out of discord comes the fairest harmony.
-- Heraclitus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20141224/dc33b9b1/attachment.asc>