[FFmpeg-devel] [Patch]x86/hevc : new idct + ASM

[Michael Niedermayer]

On Fri, Jun 13, 2014 at 10:10:53AM +0200, Pierre Edouard Lepere wrote:
> OK, I've added #if HAVE_YASM around the functions.

seems the patch isnt accepted by either patch nor git am

patching file libavcodec/x86/hevcdsp_init.c
patch: **** malformed patch at line 645: @@ -368,9 +409,17 @@ void ff_hevcdsp_init_x86(HEVCDSPContext *c, const int bit_depth)

Applying: added new idct and first idct asm
.git/rebase-apply/patch:561: tab in indent.
                void ff_hevc_idct##size##_dc_add_##bitd##_##opt(uint8_t *dst, int16_t *coeffs, ptrdiff_t stride)
fatal: corrupt patch at line 645
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.


[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Awnsering whenever a program halts or runs forever is
On a turing machine, in general impossible (turings halting problem).
On any real computer, always possible as a real computer has a finite number
of states N, and will either halt in less than N cycles or never halt.
-------------- 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/20140613/ef1c7c90/attachment.asc>