[FFmpeg-devel] [PATCH] avcodec/hevc: reduce memory used by the SAO
michaelni at gmx.at
Mon Feb 2 13:32:20 CET 2015
On Mon, Feb 02, 2015 at 07:41:54AM +0100, Christophe Gisquet wrote:
> the attached patch is somewhat of a hack job, as the commit I used may
> already have been edited from its original version, and I have added
> some stuff on top of it (eg the commit message).
hmm, is there a reason not to take the original commit unchanged ?
I was hoping to reduce the difference to openhevc so that we also
are able to merge future changes from openhevc with few confilcts
but maybe iam missing something
also it seems this does not apply cleanly
Applying: avcodec/hevc: reduce memory used by the SAO
fatal: sha1 information is lacking or useless (libavcodec/hevc.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 avcodec/hevc: reduce memory used by the SAO
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
it is not once nor twice but times without number that the same ideas make
their appearance in the world. -- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 181 bytes
Desc: Digital signature
More information about the ffmpeg-devel