diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2010-07-22 00:39:49 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2010-07-22 00:39:49 +0000 |
| commit | c7b1d9768c20ba5848f503f5258b4429fd303f3d (patch) | |
| tree | cc4f173336b323cb4064b878c4736043b95d7aba /libavcodec/x86/dsputil_mmx.c | |
| parent | a33e036577ded2b41cb33baca2e653666d77fbdf (diff) | |
| download | ffmpeg-c7b1d9768c20ba5848f503f5258b4429fd303f3d.tar.gz | |
relicense h264 deblock sse2 to lgpl
Originally committed as revision 24408 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86/dsputil_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 5d73863a47..79d4bfce29 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -2999,7 +2999,7 @@ void ff_h264dsp_init_x86(H264DSPContext *c) 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 @@ void ff_h264dsp_init_x86(H264DSPContext *c) 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 |