vlc | branch: master | Zhao Zhili <[email protected]> | Sun Nov 10 22:47:21 2019 +0800| [5d9e6fb7505dba219bbaf4cb9ebca7b4128061c2] | committer: Marvin Scholz
contrib: ffmpeg: remove gas-preprocessor on Android Build vlc-android on macOS was broken since gas-preprocessor fix_unreq is enabled by default on macOS. Signed-off-by: Marvin Scholz <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d9e6fb7505dba219bbaf4cb9ebca7b4128061c2 --- contrib/src/ffmpeg/rules.mak | 5 ----- 1 file changed, 5 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 1ba04616e5..1d34ba6bdf 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -170,11 +170,6 @@ endif ifeq ($(ANDROID_ABI), x86_64) FFMPEGCONF += --disable-mmx --disable-mmxext --disable-inline-asm endif -ifdef HAVE_NEON -ifeq ($(ANDROID_ABI), armeabi-v7a) -FFMPEGCONF += --as='gas-preprocessor.pl -as-type clang -arch arm $(CC)' -endif -endif endif # Windows _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
