Mercurial > libavcodec.hg
diff x86/h264dsp_mmx.c @ 12480:14896fa76003 libavcodec
LGPL SSE2 H.264 iDCT
This leaves no more GPL-only H.264 decoding asm code.
Approved by Loren.
author | darkshikari |
---|---|
date | Fri, 10 Sep 2010 02:25:12 +0000 |
parents | 9fef0a8ddd63 |
children | 58a960d6e34c |
line wrap: on
line diff
--- a/x86/h264dsp_mmx.c Thu Sep 09 20:23:41 2010 +0000 +++ b/x86/h264dsp_mmx.c Fri Sep 10 02:25:12 2010 +0000 @@ -475,7 +475,7 @@ } } -#if CONFIG_GPL && HAVE_YASM +#if HAVE_YASM static void ff_h264_idct_dc_add8_mmx2(uint8_t *dst, int16_t *block, int stride) { __asm__ volatile( @@ -820,11 +820,9 @@ 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 } if (mm_flags&AV_CPU_FLAG_SSSE3) { c->biweight_h264_pixels_tab[0]= ff_h264_biweight_16x16_ssse3;