Mercurial > libavcodec.hg

diff x86/dsputil_mmx.c @ 12213:c6509c205922 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
relicense h264 deblock sse2 to lgpl
author lorenm
date Thu, 22 Jul 2010 00:39:49 +0000
parents fe243bb5ef61
children 1241c824de46
line wrap: on
line diff
--- a/x86/dsputil_mmx.c	Wed Jul 21 22:45:16 2010 +0000
+++ b/x86/dsputil_mmx.c	Thu Jul 22 00:39:49 2010 +0000
@@ -2999,7 +2999,7 @@
             c->h264_idct8_add4= ff_h264_idct8_add4_sse2;
         }
 
-#if CONFIG_GPL && HAVE_YASM
+#if HAVE_YASM
         if (mm_flags & FF_MM_MMX2){
 #if ARCH_X86_32
             c->h264_v_loop_filter_luma_intra = ff_x264_deblock_v_luma_intra_mmxext;
@@ -3012,9 +3012,11 @@
                 c->h264_v_loop_filter_luma_intra = ff_x264_deblock_v_luma_intra_sse2;
                 c->h264_h_loop_filter_luma_intra = ff_x264_deblock_h_luma_intra_sse2;
 #endif
+#if CONFIG_GPL
                 c->h264_idct_add16 = ff_h264_idct_add16_sse2;
                 c->h264_idct_add8  = ff_h264_idct_add8_sse2;
                 c->h264_idct_add16intra = ff_h264_idct_add16intra_sse2;
+#endif
             }
         }
 #endif