[FFmpeg-devel] [PATCH] libavcodec/exr.c : exr lossy compression B44 based on OpenEXR code

[greeshma]

The patch is now getting applied.
PFA.



Greeshma


On Sat, Mar 28, 2015 at 8:39 AM, Michael Niedermayer <michaelni at gmx.at>
wrote:

> On Sat, Mar 28, 2015 at 02:33:44AM +0530, greeshma wrote:
> > The corrected patch is attached.
> > PFA
> >
> > Greeshma
>
> >  exr.c |  117
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 117 insertions(+)
> > d4e16ed891ed0035e8dc552efbd37f5bdcd5bf78
> 0001-exr-lossy-compression-B44-based-on-OpenEXR-code.patch
> > From 9ab93eb32d4ee7a8cacc5ce98239dd12bc75bf42 Mon Sep 17 00:00:00 2001
> > From: greeshmab <greeshmabalabadra at gmail.com>
> > Date: Tue, 24 Mar 2015 12:36:21 +0530
> > Subject: [PATCH] exr lossy compression B44(based on OpenEXR code)
> >  Signed-off-by: Greeshma <greeshmabalabadra at gmail.com>
>
> does not apply:
> Applying: exr lossy compression B44(based on OpenEXR code) Signed-off-by:
> Greeshma <greeshmabalabadra at gmail.com>
> fatal: corrupt patch at line 133
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 exr lossy compression B44(based on OpenEXR code)
> Signed-off-by: Greeshma <greeshmabalabadra at gmail.com>
> 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".
>
> please make sure you attach the git patch without modifications
>
> [...]
>
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> The real ebay dictionary, page 3
> "Rare item" - "Common item with rare defect or maybe just a lie"
> "Professional" - "'Toy' made in china, not functional except as doorstop"
> "Experts will know" - "The seller hopes you are not an expert"
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-exr-lossy-compression-B44-based-on-OpenEXR-code.patch
Type: text/x-patch
Size: 5919 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150402/5524ae0b/attachment.bin>