diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-11-27 22:42:55 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-11-27 22:42:55 +0000 |
| commit | 5b67ce2afa1a692af0fc431641bbbbb04da19bca (patch) | |
| tree | e6cb00cdca703b6785ff5dd6c4d4f9806f149fee /libavcodec/i386 | |
| parent | 43de50659b74610de4d531916b94269d6fe3d31e (diff) | |
build vc1dsp_mmx.c in its own compilation unit
Originally committed as revision 11102 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/i386')
| -rw-r--r-- | libavcodec/i386/dsputil_mmx.c | 11 | ||||
| -rw-r--r-- | libavcodec/i386/vc1dsp_mmx.c | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c index 06b4b2728f..2c8173b948 100644 --- a/libavcodec/i386/dsputil_mmx.c +++ b/libavcodec/i386/dsputil_mmx.c @@ -2843,10 +2843,6 @@ PREFETCH(prefetch_3dnow, prefetch) #undef PREFETCH #include "h264dsp_mmx.c" -#if defined(CONFIG_VC1_DECODER) || defined(CONFIG_WMV3_DECODER) \ - || defined(CONFIG_VC1_ENCODER) || defined(CONFIG_WMV3_ENCODER) -#include "vc1dsp_mmx.c" -#endif /* AVS specific */ void ff_cavsdsp_init_mmx2(DSPContext* c, AVCodecContext *avctx); @@ -2864,6 +2860,13 @@ void ff_avg_cavs_qpel16_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride) { avg_pixels16_mmx(dst, src, stride, 16); } +/* VC1 specific */ +void ff_vc1dsp_init_mmx(DSPContext* dsp, AVCodecContext *avctx); + +void ff_put_vc1_mspel_mc00_mmx(uint8_t *dst, const uint8_t *src, int stride, int rnd) { + put_pixels8_mmx(dst, src, stride, 8); +} + /* external functions, from idct_mmx.c */ void ff_mmx_idct(DCTELEM *block); void ff_mmxext_idct(DCTELEM *block); diff --git a/libavcodec/i386/vc1dsp_mmx.c b/libavcodec/i386/vc1dsp_mmx.c index 418c2bd407..9e2b9a4568 100644 --- a/libavcodec/i386/vc1dsp_mmx.c +++ b/libavcodec/i386/vc1dsp_mmx.c @@ -444,9 +444,7 @@ static void vc1_mspel_mc(uint8_t *dst, const uint8_t *src, int stride, vc1_put_shift_8bits[hmode](dst, src, stride, rnd, 1); } -static void put_vc1_mspel_mc00_mmx(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - put_pixels8_mmx(dst, src, stride, 8); -} +void ff_put_vc1_mspel_mc00_mmx(uint8_t *dst, const uint8_t *src, int stride, int rnd); /** Macro to ease bicubic filter interpolation functions declarations */ #define DECLARE_FUNCTION(a, b) \ @@ -474,7 +472,7 @@ DECLARE_FUNCTION(3, 2) DECLARE_FUNCTION(3, 3) void ff_vc1dsp_init_mmx(DSPContext* dsp, AVCodecContext *avctx) { - dsp->put_vc1_mspel_pixels_tab[ 0] = put_vc1_mspel_mc00_mmx; + dsp->put_vc1_mspel_pixels_tab[ 0] = ff_put_vc1_mspel_mc00_mmx; dsp->put_vc1_mspel_pixels_tab[ 4] = put_vc1_mspel_mc01_mmx; dsp->put_vc1_mspel_pixels_tab[ 8] = put_vc1_mspel_mc02_mmx; dsp->put_vc1_mspel_pixels_tab[12] = put_vc1_mspel_mc03_mmx; |