[FFmpeg-cvslog] swscale: fix filter alignment reduction without inline asm

Hendrik Leppkes git at videolan.org
Fri Jun 21 21:17:41 CEST 2013


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Jun 21 18:10:38 2013 +0200| [7cdf574c22b85e53ed42e64313700193f00e378f] | committer: Michael Niedermayer

swscale: fix filter alignment reduction without inline asm

Fixes scaling in MSVC/ICL, where inline asm is not present, but the
YASM scaling code is.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cdf574c22b85e53ed42e64313700193f00e378f
---

 libswscale/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 6324bc8..fb0a7ad 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -535,7 +535,7 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
             filterAlign = 1;
     }
 
-    if (INLINE_MMX(cpu_flags)) {
+    if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) {
         // special case for unscaled vertical filtering
         if (minFilterSize == 1 && filterAlign == 2)
             filterAlign = 1;



More information about the ffmpeg-cvslog mailing list