diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-09-10 02:25:12 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-09-10 02:25:12 +0000 |
| commit | 8acb554aff34375358204b928a5a28498b135726 (patch) | |
| tree | e310bf45f11c023a8eea3067522dd5eb1b75a692 /libavcodec/x86/h264dsp_mmx.c | |
| parent | 20de72a447bffa70e6ef345fea441c4cd229312c (diff) | |
| download | ffmpeg-8acb554aff34375358204b928a5a28498b135726.tar.gz | |
LGPL SSE2 H.264 iDCT
This leaves no more GPL-only H.264 decoding asm code.
Approved by Loren.
Originally committed as revision 25092 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86/h264dsp_mmx.c')
| -rw-r--r-- | libavcodec/x86/h264dsp_mmx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/x86/h264dsp_mmx.c b/libavcodec/x86/h264dsp_mmx.c index 9d6513ed90..456a4c8a4a 100644 --- a/libavcodec/x86/h264dsp_mmx.c +++ b/libavcodec/x86/h264dsp_mmx.c @@ -475,7 +475,7 @@ static void ff_h264_idct_add8_mmx2(uint8_t **dest, const int *block_offset, DCTE } } -#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 @@ 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 } if (mm_flags&AV_CPU_FLAG_SSSE3) { c->biweight_h264_pixels_tab[0]= ff_h264_biweight_16x16_ssse3; |