diff options
| author | Albert Lee <trisk+xine@acm.jhu.edu> | 2007-06-14 16:36:22 +0200 |
|---|---|---|
| committer | Albert Lee <trisk+xine@acm.jhu.edu> | 2007-06-14 16:36:22 +0200 |
| commit | 155b971f55bae045350a0ee9a4068d3aacd2119b (patch) | |
| tree | 4dcaa84b8fbb8a8397a92284bab30f615ba8a254 /src/libffmpeg/libavcodec/mpegvideo.c | |
| parent | 35b00bd2d7c78908a160f9a003e55c069a42eb49 (diff) | |
| download | xine-lib-155b971f55bae045350a0ee9a4068d3aacd2119b.tar.gz xine-lib-155b971f55bae045350a0ee9a4068d3aacd2119b.tar.bz2 | |
Init mpegvideo only once (fixes when MMX and mediaLib are both present).
Applied to FFmpeg tree already.
Diffstat (limited to 'src/libffmpeg/libavcodec/mpegvideo.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/mpegvideo.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/libffmpeg/libavcodec/mpegvideo.c b/src/libffmpeg/libavcodec/mpegvideo.c index 87c913efa..76c300600 100644 --- a/src/libffmpeg/libavcodec/mpegvideo.c +++ b/src/libffmpeg/libavcodec/mpegvideo.c @@ -287,22 +287,17 @@ int DCT_common_init(MpegEncContext *s) s->denoise_dct= denoise_dct_c; #endif //CONFIG_ENCODERS -#ifdef HAVE_MMX +#if defined(HAVE_MMX) MPV_common_init_mmx(s); -#endif -#ifdef ARCH_ALPHA +#elif defined(ARCH_ALPHA) MPV_common_init_axp(s); -#endif -#ifdef HAVE_MLIB +#elif defined(HAVE_MLIB) MPV_common_init_mlib(s); -#endif -#ifdef HAVE_MMI +#elif defined(HAVE_MMI) MPV_common_init_mmi(s); -#endif -#ifdef ARCH_ARMV4L +#elif defined(ARCH_ARMV4L) MPV_common_init_armv4l(s); -#endif -#ifdef ARCH_POWERPC +#elif defined(ARCH_POWERPC) MPV_common_init_ppc(s); #endif |