[FFmpeg-devel] [Patch][OpenHEVC]added ASM DBF functions

[Ronald S. Bultje]

Hi,

On Fri, May 16, 2014 at 5:42 PM, Michael Niedermayer <michaelni at gmx.at>wrote:

> On Fri, May 16, 2014 at 06:38:57PM -0300, James Almer wrote:
> > On 16/05/14 4:06 PM, Michael Niedermayer wrote:
> > > On Fri, May 16, 2014 at 05:05:43PM +0200, Pierre Edouard Lepere wrote:
> > >> Hi,
> > >>
> > >> I've put the changes suggested by Ronald in IRC. This should be it
> for the DBF unless someone finds something critical.
> > >
> > > applied the first 2 patches, the 3rd breaks mingw64 build
> > >
> > > libavcodec/x86/hevc_deblock.asm:816: error: instruction expected after
> label
> > > libavcodec/x86/hevc_deblock.asm:822: error: instruction expected after
> label
> > > libavcodec/x86/hevc_deblock.asm:824: error: instruction expected after
> label
> > > libavcodec/x86/hevc_deblock.asm:825: error: label or instruction
> expected at start of line
> > > libavcodec/x86/hevc_deblock.asm:826: error: instruction expected after
> label
> > > libavcodec/x86/hevc_deblock.asm:827: error: label or instruction
> expected at start of line
> > > libavcodec/x86/hevc_deblock.asm:828: error: label or instruction
> expected at start of line
> > > libavcodec/x86/hevc_deblock.asm:829: error: label or instruction
> expected at start of line
> > > libavcodec/x86/hevc_deblock.asm:831: error: instruction expected after
> label
> > > libavcodec/x86/hevc_deblock.asm:834: error: redefinition of
> `to_store_v10'
> > > libavcodec/x86/hevc_deblock.asm:833: error: `to_store_v10' previously
> defined here
> > > libavcodec/x86/hevc_deblock.asm:835: error: instruction expected after
> label
> > > libavcodec/x86/hevc_deblock.asm:842: error: label or instruction
> expected at start of line
> > > libavcodec/x86/hevc_deblock.asm:843: error: instruction expected after
> label
> >
> > The patch doesn't apply cleanly here (It expects some tabulations that
> > are not present in the tree),
>
> yes i had to remove the tabs as the git hooks reject pushes that add
> tabs
>
>
> > but when i fix the conflicts it compiles
> > with no errors.
>
> interresting


Probably nasm vs yasm, maybe look for labels without colon at the end
(".bla" vs ".bla:") etc. - I'll try to review over weekend if I can find
time. If you can fix it before that, just commit, don't wait for me (unless
it breaks fate ofc.)

Ronald