Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / arm / mpegvideo_arm.c

diff --git a/libavcodec/arm/mpegvideo_arm.c b/libavcodec/arm/mpegvideo_arm.c
index b2b254e2d3e39a889024f9ad91244321f4b3b971..73d03c1a5e62c36d04cd58aa546dadb7246babbb 100644 (file)
--- a/libavcodec/arm/mpegvideo_arm.c
+++ b/libavcodec/arm/mpegvideo_arm.c
@@ -40,16 +40,9 @@ void ff_dct_unquantize_h263_intra_neon(MpegEncContext *s, DCTELEM *block,
 
 void ff_MPV_common_init_arm(MpegEncContext *s)
 {
-    /* IWMMXT support is a superset of armv5te, so
-     * allow optimized functions for armv5te unless
-     * a better iwmmxt function exists
-     */
 #if HAVE_ARMV5TE
     ff_MPV_common_init_armv5te(s);
 #endif
-#if HAVE_IWMMXT
-    ff_MPV_common_init_iwmmxt(s);
-#endif
 
     if (HAVE_NEON) {
         s->dct_unquantize_h263_intra = ff_dct_unquantize_h263_intra_neon;