diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-02-10 13:16:36 +0000 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-02-12 10:50:37 +0000 |
| commit | 50945482a75c009ad932ccda5c7d406e8319e54f (patch) | |
| tree | f71925c5cf501891cb92f560b78ac7d9a8770f90 /libavcodec | |
| parent | 4961ddfd3563a075bdea7d729361adc95370d967 (diff) | |
| download | ffmpeg-50945482a75c009ad932ccda5c7d406e8319e54f.tar.gz | |
h264_idct: enable unmacro on newer NASM versions
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/h264_idct.asm | 6 |
1 files changed, 5 insertions, 1 deletions
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] |