diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 27a9e957c2..1bb2841a7c 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -37,6 +37,7 @@ #include "simple_idct.h" #include "faandct.h" #include "faanidct.h" +#include "i386/idct_xvid.h" #ifndef MAX #define MAX(a, b) (((a) > (b)) ? (a) : (b)) @@ -50,8 +51,6 @@ void *fast_memcpy(void *a, const void *b, size_t c){return memcpy(a,b,c);}; /* reference fdct/idct */ extern void fdct(DCTELEM *block); extern void idct(DCTELEM *block); -extern void ff_idct_xvid_mmx(DCTELEM *block); -extern void ff_idct_xvid_mmx2(DCTELEM *block); extern void init_fdct(); extern void ff_mmx_idct(DCTELEM *data); diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c index 85cbfb655f..3ae1b5947f 100644 --- a/libavcodec/i386/dsputil_mmx.c +++ b/libavcodec/i386/dsputil_mmx.c @@ -30,14 +30,12 @@ #include "mmx.h" #include "vp3dsp_mmx.h" #include "vp3dsp_sse2.h" +#include "idct_xvid.h" #include "h263.h" //#undef NDEBUG //#include <assert.h> -extern void ff_idct_xvid_mmx(short *block); -extern void ff_idct_xvid_mmx2(short *block); - int mm_flags; /* multimedia extension flags */ /* pixel operations */ diff --git a/libavcodec/i386/idct_xvid.h b/libavcodec/i386/idct_xvid.h new file mode 100644 index 0000000000..3c81244619 --- /dev/null +++ b/libavcodec/i386/idct_xvid.h @@ -0,0 +1,32 @@ +/* + * XVID MPEG-4 VIDEO CODEC + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/*! + * @file idct_xvid.h + * header for Xvid IDCT functions + */ + +#ifndef FFMPEG_IDCT_XVID_H +#define FFMPEG_IDCT_XVID_H + +void ff_idct_xvid_mmx(short *block); +void ff_idct_xvid_mmx2(short *block); + +#endif /* FFMPEG_IDCT_XVID_H */