From 049f65f8a82e8b6379670a81fe59ae223ea837e1 Mon Sep 17 00:00:00 2001 From: Kevin Bracey Date: Mon, 10 Jan 2022 19:17:02 +0200 Subject: [PATCH] ffmpeg: pass CPU flags --- release/src/router/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/src/router/Makefile b/release/src/router/Makefile index b16fe46af58b..4d1843b5063b 100644 --- a/release/src/router/Makefile +++ b/release/src/router/Makefile @@ -5088,9 +5088,11 @@ FFMPEG_CONFIGURE_PROTOCOLS:=$(call FFMPEG_FILTER_CONFIG,enable-protocol,$(FFMPEG FFMPEG_DISABLED_DEMUXERS:=aa acm act adf adp ads adx afc aix amr amrnb amrwb apc ape apng aptx aptx_hd aqtitle asf_o ass ast avr bethsoftvid bfi bfstm bit bmv boa brstm c93 cdxl cine codec2 codec2raw concat data daud dcstr dfa dirac dnxhd dsf dsicin dss dtshd dvbsub dvbtxt dxa epaf ffmetadata fits frm fsb g722 g723_1 g726 g726le g729 gdv genh gif gsm gxf hevc hls hnm ico idcin idf iff ilbc image2 image2pipe image_bmp_pipe image_dds_pipe image_dpx_pipe image_exr_pipe image_j2k_pipe image_jpeg_pipe image_jpegls_pipe image_pam_pipe image_pbm_pipe image_pcx_pipe image_pgm_pipe image_pgmyuv_pipe image_pictor_pipe image_png_pipe image_ppm_pipe image_psd_pipe image_qdraw_pipe image_sgi_pipe image_sunrast_pipe image_svg_pipe image_tiff_pipe image_webp_pipe image_xpm_pipe ingenient ipmovie ircam ivf ivr jacosub jv live_flv lmlm4 loas lrc lvf lxf mgsts microdvd mjpeg_2000 mlv mm mmf mpjpeg mpl2 mpsub msf msnwc_tcp mtaf mtv musx mv mxf mxg nistsphere nsp nsv nut oma paf pjs pmp pva pvf rawvideo realtext redspark rl2 roq rpl rsd rso s337m sami sbc sbg scc sdr2 sds sdx segafilm shorten siff sln smacker smjpeg smush sol spdif srt stl str subviewer subviewer1 sup svag tak tedcaptions thp threedostr tiertexseq tta tty txd ty v210 v210x vag vivo vmd vobsub voc vpk vplayer wc3 webm_dash_manifest webvtt wsaud wsd wsvqa wtv wve xa xbin xmv xvag xwma yuv4mpegpipe FFMPEG_CONFIGURE_DEMUXERS:=$(call FFMPEG_FILTER_CONFIG,disable-demuxer,$(FFMPEG_DISABLED_DEMUXERS)) +FFMPEG_CPU:=$(patsubst -mcpu=%,--cpu=%,$(filter -mcpu=%,$(ARMCPUFLAGS))) + ffmpeg/stamp-h1: $(if $(FFMPEG_ZLIB_REQD),zlib,) cd ffmpeg && symver_asm_label=no symver_gnu_asm=no symver=no CC=$(CC) LDFLAGS="-ldl"\ - ./configure --enable-cross-compile --arch=$(ARCH) --target_os=linux \ + ./configure --enable-cross-compile --arch=$(ARCH) $(FFMPEG_CPU) --target_os=linux \ --cross-prefix=$(CROSS_COMPILE) --enable-gpl \ $(if $(MEDIA_SERVER_STATIC),,--disable-static --enable-shared) --enable-small \ --disable-runtime-cpudetect --disable-mipsfpu --disable-mipsdsp --disable-mipsdspr2 \ @@ -5106,7 +5108,7 @@ ffmpeg/stamp-h1: $(if $(FFMPEG_ZLIB_REQD),zlib,) --disable-bsfs \ --disable-protocols $(FFMPEG_CONFIGURE_PROTOCOLS) \ --disable-devices --disable-filters \ - --extra-cflags="-Os $(EXTRACFLAGSx) -ffunction-sections -fdata-sections -fPIC $(if $(FFMPEG_ZLIB_REQD),-I$(TOP)/zlib,)" \ + --extra-cflags="-Os $(CPUCFLAGS) -ffunction-sections -fdata-sections -fPIC $(if $(FFMPEG_ZLIB_REQD),-I$(TOP)/zlib,)" \ --extra-ldflags="-ffunction-sections -fdata-sections -Wl,--gc-sections -fPIC" \ $(if $(FFMPEG_ZLIB_REQD),--extra-libs="-L$(TOP)/zlib -lz" --enable-zlib,--disable-zlib) \ --disable-debug --prefix=''