# HG changeset patch # User lorenm # Date 1141770812 0 # Node ID 9a2cc7b0fbdb5fd1b41958639c6e67d4393f689d # Parent 038e1b4f9afd64df4ec15570d96850af33545c1d h264_idct_add only needs mmx1 diff -r 038e1b4f9afd -r 9a2cc7b0fbdb i386/dsputil_mmx.c --- a/i386/dsputil_mmx.c Mon Mar 06 22:06:33 2006 +0000 +++ b/i386/dsputil_mmx.c Tue Mar 07 22:33:32 2006 +0000 @@ -2732,6 +2732,9 @@ c->put_h264_chroma_pixels_tab[0]= put_h264_chroma_mc8_mmx; c->put_h264_chroma_pixels_tab[1]= put_h264_chroma_mc4_mmx; + c->h264_idct_dc_add= + c->h264_idct_add= ff_h264_idct_add_mmx; + if (mm_flags & MM_MMXEXT) { c->put_pixels_tab[0][1] = put_pixels16_x2_mmx2; c->put_pixels_tab[0][2] = put_pixels16_y2_mmx2; @@ -2753,7 +2756,6 @@ c->vsad[4]= vsad_intra16_mmx2; #endif //CONFIG_ENCODERS - c->h264_idct_add= ff_h264_idct_add_mmx2; c->h264_idct_dc_add= ff_h264_idct_dc_add_mmx2; c->h264_idct8_dc_add= ff_h264_idct8_dc_add_mmx2; diff -r 038e1b4f9afd -r 9a2cc7b0fbdb i386/h264dsp_mmx.c --- a/i386/h264dsp_mmx.c Mon Mar 06 22:06:33 2006 +0000 +++ b/i386/h264dsp_mmx.c Tue Mar 07 22:33:32 2006 +0000 @@ -65,7 +65,7 @@ "packuswb "#z", "#p" \n\t"\ "movd "#p", (%0) \n\t" -void ff_h264_idct_add_mmx2(uint8_t *dst, int16_t *block, int stride) +static void ff_h264_idct_add_mmx(uint8_t *dst, int16_t *block, int stride) { /* Load dct coeffs */ asm volatile( @@ -104,7 +104,7 @@ ); } -void ff_h264_idct_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride) +static void ff_h264_idct_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride) { int dc = (block[0] + 32) >> 6; asm volatile( @@ -140,7 +140,7 @@ ); } -void ff_h264_idct8_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride) +static void ff_h264_idct8_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride) { int dc = (block[0] + 32) >> 6; int y;