[FFmpeg-devel] [PATCH 3/3] x86: sbrdsp: implement SSE2 hf_apply_noise

[Christophe Gisquet]

Hi,

2013/4/12 Michael Niedermayer <michaelni at gmx.at>:
> Applying this or 2/3 and this i get
> libavcodec/x86/sbrdsp.asm:357: error: (PROLOGUE:2) cannot reference symbol `NREGS' in preprocessor
> libavcodec/x86/sbrdsp.asm:364: error: (PROLOGUE:2) cannot reference symbol `NREGS' in preprocessor
> libavcodec/x86/sbrdsp.asm:367: error: (LOAD_NST:1) cannot reference symbol `NREGS' in preprocessor
> libavcodec/x86/sbrdsp.asm:373: error: (PROLOGUE:2) cannot reference symbol `NREGS' in preprocessor
> libavcodec/x86/sbrdsp.asm:380: error: (PROLOGUE:2) cannot reference symbol `NREGS' in preprocessor
> libavcodec/x86/sbrdsp.asm:383: error: (LOAD_NST:1) cannot reference symbol `NREGS' in preprocessor
> libavcodec/x86/sbrdsp.asm:394: error: cannot reference symbol `NREGS' in preprocessor

Indeed, bad conflict resolution after rebasing I guess.

Here's a fixed version, for which fate-aac runs fine on win32 and win64.

--
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-x86-sbrdsp-implement-SSE2-hf_apply_noise.patch
Type: application/octet-stream
Size: 7420 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130412/680ed8e6/attachment.obj>