fdct_mmx -> ff_fdct_mmx (renamed to avoid namespace conflict with xvid)

[found by Kim Minh Kaplan]

Originally committed as revision 960 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Arpi 23 years ago
parent b3a391e8b8
commit 3f09f52adf
  1. 2
      libavcodec/dct-test.c
  2. 2
      libavcodec/dsputil.h
  3. 2
      libavcodec/i386/fdct_mmx.c
  4. 2
      libavcodec/i386/mpegvideo_mmx.c
  5. 2
      libavcodec/i386/mpegvideo_mmx_template.c

@ -307,7 +307,7 @@ int main(int argc, char **argv)
dct_error("REF-DBL", 0, fdct, fdct, test); /* only to verify code ! */
dct_error("IJG-AAN-INT", 0, fdct_ifast, fdct, test);
dct_error("IJG-LLM-INT", 0, ff_jpeg_fdct_islow, fdct, test);
dct_error("MMX", 0, fdct_mmx, fdct, test);
dct_error("MMX", 0, ff_fdct_mmx, fdct, test);
} else {
dct_error("REF-DBL", 1, idct, idct, test);
dct_error("INT", 1, j_rev_dct, idct, test);

@ -31,7 +31,7 @@ void ff_jpeg_fdct_islow (DCTELEM *data);
void j_rev_dct (DCTELEM *data);
void fdct_mmx(DCTELEM *block);
void ff_fdct_mmx(DCTELEM *block);
/* encoding scans */
extern UINT8 ff_alternate_horizontal_scan[64];

@ -267,7 +267,7 @@ static inline void fdct_row(const int16_t *in, int16_t *out, const int16_t *tabl
movq_r2m(mm6, *(out + 4));
}
void fdct_mmx(int16_t *block)
void ff_fdct_mmx(int16_t *block)
{
/* XXX: not thread safe */
static int16_t block_tmp[64] ATTR_ALIGN(8);

@ -560,7 +560,7 @@ void MPV_common_init_mmx(MpegEncContext *s)
draw_edges = draw_edges_mmx;
if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){
s->fdct = fdct_mmx;
s->fdct = ff_fdct_mmx;
if(mm_flags & MM_MMXEXT){
s->dct_quantize= dct_quantize_MMX2;

@ -41,7 +41,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
static __align8 INT16 temp_block[64];
//s->fdct (block);
fdct_mmx (block); //cant be anything else ...
ff_fdct_mmx (block); //cant be anything else ...
if (s->mb_intra) {
int dummy;

Loading…
Cancel
Save