[FFmpeg-cvslog] libavcodec/x86/dwt.c: move some missed things under HAVE_YASM

Michael Niedermayer git at videolan.org
Sun Jun 10 03:33:50 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 10 03:20:27 2012 +0200| [63bfee8796485b676f51f7fa5f25a44eae2bfd0e] | committer: Michael Niedermayer

libavcodec/x86/dwt.c: move some missed things under HAVE_YASM

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/x86/dwt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/x86/dwt.c b/libavcodec/x86/dwt.c
index 45b3b34..1eb8221 100644
--- a/libavcodec/x86/dwt.c
+++ b/libavcodec/x86/dwt.c
@@ -114,7 +114,6 @@ static void horizontal_compose_haar1i##ext(IDWTELEM *b, IDWTELEM *tmp, int w)\
 COMPOSE_VERTICAL(_mmx, 4)
 #endif
 COMPOSE_VERTICAL(_sse2, 8)
-#endif
 
 
 void ff_horizontal_compose_dd97i_ssse3(IDWTELEM *b, IDWTELEM *tmp, int w);
@@ -130,6 +129,7 @@ static void horizontal_compose_dd97i_ssse3(IDWTELEM *b, IDWTELEM *tmp, int w)
         b[2*x+1] = (COMPOSE_DD97iH0(tmp[x-1], tmp[x], b[x+w2], tmp[x+1], tmp[x+2]) + 1)>>1;
     }
 }
+#endif
 
 void ff_spatial_idwt_init_mmx(DWTContext *d, enum dwt_type type)
 {



More information about the ffmpeg-cvslog mailing list