ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sat Sep 19 20:27:03 2015 -0300| [4bb6cb4c7db41e04057a15d7629d0ce1c4556d85] | committer: James Almer
x86/vp9mc: fix string concatenation of fullpel function names Fixes compilation with NASM Reviewed-by: Ronald S. Bultje <rsbul...@gmail.com> Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4bb6cb4c7db41e04057a15d7629d0ce1c4556d85 --- libavcodec/x86/vp9mc.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/vp9mc.asm b/libavcodec/x86/vp9mc.asm index d828312..9152ba5 100644 --- a/libavcodec/x86/vp9mc.asm +++ b/libavcodec/x86/vp9mc.asm @@ -583,11 +583,11 @@ filter_vx2_fn avg %endif %if %2 <= mmsize -cglobal vp9_%1%2%%szsuf, 5, 7, 4, dst, dstride, src, sstride, h, dstride3, sstride3 +cglobal vp9_%1%2 %+ %%szsuf, 5, 7, 4, dst, dstride, src, sstride, h, dstride3, sstride3 lea sstride3q, [sstrideq*3] lea dstride3q, [dstrideq*3] %else -cglobal vp9_%1%2%%szsuf, 5, 5, %8, dst, dstride, src, sstride, h +cglobal vp9_%1%2 %+ %%szsuf, 5, 5, %8, dst, dstride, src, sstride, h %endif .loop: %%srcfn m0, [srcq] _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
