Re: [FFmpeg-devel] [PATCH] h264_idct: enable unmacro on newer NASM versions

2018-02-12 Thread Rostislav Pehlivanov 
On 12 February 2018 at 09:24, James Darnley  wrote:

> On 2018-02-10 14:17, Rostislav Pehlivanov wrote:
> > Signed-off-by: Rostislav Pehlivanov 
> > ---
> >  libavcodec/x86/h264_idct.asm | 6 +-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm
> > index 8804638091..c54f9f1a68 100644
> > --- a/libavcodec/x86/h264_idct.asm
> > +++ b/libavcodec/x86/h264_idct.asm
> > @@ -1144,7 +1144,11 @@ IDCT_DC_DEQUANT 0
> >  INIT_MMX sse2
> >  IDCT_DC_DEQUANT 7
> >
> > -; %unmacro STORE_DIFFx2 8 ; remove macro from x86util.asm but yasm
> doesn't have this yet
> > +%ifdef __NASM_VER__
> > +%if __NASM_MAJOR__ >= 2 && __NASM_MINOR__ >= 4
> > +%unmacro STORE_DIFFx2 8 ; remove macro from x86util.asm but yasm
> doesn't have this yet
> > +%endif
> > +%endif
> >  %macro STORE_DIFFx2 8 ; add1, add2, reg1, reg2, zero, shift, source,
> stride
> >  movd   %3, [%7]
> >  movd   %4, [%7+%8]
> >
>
> Looks good to me.  Thanks for picking up my slack on this one.
>
> ___
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

Thanks, pushed
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] h264_idct: enable unmacro on newer NASM versions

2018-02-12 Thread James Darnley 
On 2018-02-10 14:17, Rostislav Pehlivanov wrote:
> Signed-off-by: Rostislav Pehlivanov 
> ---
>  libavcodec/x86/h264_idct.asm | 6 +-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm
> index 8804638091..c54f9f1a68 100644
> --- a/libavcodec/x86/h264_idct.asm
> +++ b/libavcodec/x86/h264_idct.asm
> @@ -1144,7 +1144,11 @@ IDCT_DC_DEQUANT 0
>  INIT_MMX sse2
>  IDCT_DC_DEQUANT 7
>  
> -; %unmacro STORE_DIFFx2 8 ; remove macro from x86util.asm but yasm doesn't 
> have this yet
> +%ifdef __NASM_VER__
> +%if __NASM_MAJOR__ >= 2 && __NASM_MINOR__ >= 4
> +%unmacro STORE_DIFFx2 8 ; remove macro from x86util.asm but yasm doesn't 
> have this yet
> +%endif
> +%endif
>  %macro STORE_DIFFx2 8 ; add1, add2, reg1, reg2, zero, shift, source, stride
>  movd   %3, [%7]
>  movd   %4, [%7+%8]
> 

Looks good to me.  Thanks for picking up my slack on this one.

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] h264_idct: enable unmacro on newer NASM versions

2018-02-10 Thread Rostislav Pehlivanov 
Signed-off-by: Rostislav Pehlivanov 
---
 libavcodec/x86/h264_idct.asm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm
index 8804638091..c54f9f1a68 100644
--- a/libavcodec/x86/h264_idct.asm
+++ b/libavcodec/x86/h264_idct.asm
@@ -1144,7 +1144,11 @@ IDCT_DC_DEQUANT 0
 INIT_MMX sse2
 IDCT_DC_DEQUANT 7
 
-; %unmacro STORE_DIFFx2 8 ; remove macro from x86util.asm but yasm doesn't 
have this yet
+%ifdef __NASM_VER__
+%if __NASM_MAJOR__ >= 2 && __NASM_MINOR__ >= 4
+%unmacro STORE_DIFFx2 8 ; remove macro from x86util.asm but yasm doesn't have 
this yet
+%endif
+%endif
 %macro STORE_DIFFx2 8 ; add1, add2, reg1, reg2, zero, shift, source, stride
 movd   %3, [%7]
 movd   %4, [%7+%8]
-- 
2.16.1.101.gde0f0111ea

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel