diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-03-25 21:30:16 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-03-25 21:30:16 +0000 |
| commit | a8150374097de8187ebff49755cb7c08be40e340 (patch) | |
| tree | c4c2c85c414bdae75a68af97fcfc3430bd43289a /libavcodec | |
| parent | 5ce265a1dea888c4a5f23ae6d7dfaedaf38c07ef (diff) | |
| download | ffmpeg-a8150374097de8187ebff49755cb7c08be40e340.tar.gz | |
Classify mlib as a configurable option, not as a hardware feature.
Originally committed as revision 12589 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b7896563cb..89082d87de 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -410,7 +410,7 @@ ASM_OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o \ OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ sparc/simple_idct_vis.o \ -OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \ +OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \ OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ alpha/motion_est_alpha.o \ diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 7f3b907781..67f0e940c8 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -125,7 +125,7 @@ int ff_dct_common_init(MpegEncContext *s) MPV_common_init_mmx(s); #elif defined(ARCH_ALPHA) MPV_common_init_axp(s); -#elif defined(HAVE_MLIB) +#elif defined(CONFIG_MLIB) MPV_common_init_mlib(s); #elif defined(HAVE_MMI) MPV_common_init_mmi(s); |