diff --git a/libavcodec/armv4l/mpegvideo_arm.c b/libavcodec/armv4l/mpegvideo_arm.c index ca972e6ed8..22d40d8bcf 100644 --- a/libavcodec/armv4l/mpegvideo_arm.c +++ b/libavcodec/armv4l/mpegvideo_arm.c @@ -28,9 +28,14 @@ extern void MPV_common_init_armv5te(MpegEncContext *s); void MPV_common_init_armv4l(MpegEncContext *s) { -#ifdef HAVE_IWMMXT - MPV_common_init_iwmmxt(s); -#elif defined(HAVE_ARMV5TE) + /* IWMMXT support is a superset of armv5te, so + * allow optimised functions for armv5te unless + * a better iwmmxt function exists + */ +#ifdef HAVE_ARMV5TE MPV_common_init_armv5te(s); #endif +#ifdef HAVE_IWMMXT + MPV_common_init_iwmmxt(s); +#endif }