contrib: enable NEON runtime selection for ffmpeg

This is explicitely done for android only, since we lost the
benefits of some inline NEON asm

contrib/src/ffmpeg/rules.mak

@@ -53,11 +53,14 @@ endif
 # ARM stuff
 ifeq ($(ARCH),arm)
 FFMPEGCONF += --arch=arm
-ifdef HAVE_NEON
+ifdef HAVE_ARMV7A
 FFMPEGCONF += --cpu=cortex-a8 --enable-neon
+FFMPEG_CFLAGS += -mfpu=vfpv3-d16
+ifndef HAVE_ANDROID # We want NEON autodetect on Android
 FFMPEG_CFLAGS += -mfpu=neon
 endif
 endif
+endif
 
 # MIPS stuff
 ifeq ($(ARCH),mipsel)