RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Arpi 2002-09-19 22:14:53 +00:00
parent b3a391e8b8
commit 3f09f52adf
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dct-test.c
View File

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

2
libavcodec/dsputil.h
View File

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

2
libavcodec/i386/fdct_mmx.c
View File

@ -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)); movq_r2m(mm6, *(out + 4));
} }
void fdct_mmx(int16_t *block) void ff_fdct_mmx(int16_t *block)
{ {
/* XXX: not thread safe */ /* XXX: not thread safe */
static int16_t block_tmp[64] ATTR_ALIGN(8); static int16_t block_tmp[64] ATTR_ALIGN(8);

2
libavcodec/i386/mpegvideo_mmx.c
View File

@ -560,7 +560,7 @@ void MPV_common_init_mmx(MpegEncContext *s)
draw_edges = draw_edges_mmx; draw_edges = draw_edges_mmx;
if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_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){ if(mm_flags & MM_MMXEXT){
s->dct_quantize= dct_quantize_MMX2; s->dct_quantize= dct_quantize_MMX2;

2
libavcodec/i386/mpegvideo_mmx_template.c
View File

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