Merge branch 'next'

[coffee/buildroot.git] / package / ffmpeg / Config.in

diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index 3a7bfd3122133a4f7390cbc2f816acdcd51231b1..a3ca1054d9b4aa379b3d4e1f416a9dd04a8c94c5 100644 (file)
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -1,10 +1,8 @@
 config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        bool
        # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
-       # ffmpeg's configure script only supports mips64 (r1) variant
        # No support for ARMv7-M in the ARM assembly logic
-       default y if !BR2_nios2 && !BR2_mips_64r2 && !BR2_mips_64r6 && \
-               !BR2_ARM_CPU_ARMV7M
+       default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M
 
 menuconfig BR2_PACKAGE_FFMPEG
        bool "ffmpeg"