From af8c3fda0e387c72e26e0c1440f47271d09ba7e1 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 30 Aug 2020 12:47:27 +0200 Subject: [PATCH] ffmpeg.mk: enable ffmpeg for CST --- make/ffmpeg.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/make/ffmpeg.mk b/make/ffmpeg.mk index 504b72d..8c09516 100644 --- a/make/ffmpeg.mk +++ b/make/ffmpeg.mk @@ -1,3 +1,8 @@ +ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1)) +FFMPEG_OPTIONS = --disable-ffprobe +FFMPEG_OPTIONS += --disable-ffserver +endif + ifeq ($(BOXTYPE), coolstream) FFMPEG_CONFIGURE = \ --disable-doc \ @@ -74,7 +79,6 @@ FFMPEG_CONFIGURE = \ --disable-muxers \ --enable-muxer=mpegts \ \ - --disable-programs \ --disable-static \ --disable-filters \ \ @@ -125,7 +129,8 @@ FFMPEG_CONFIGURE = \ --disable-neon \ --disable-runtime-cpudetect \ --arch=arm \ - --pkg-config=pkg-config + --pkg-config=pkg-config \ + $(FFMPEG_OPTIONS) else ifeq ($(BOXTYPE), armbox) ifeq ($(FFMPEG_VER), 3.3) @@ -430,7 +435,7 @@ FFMPEG_CONFIGURE = \ --extra-cflags="$(FFMPRG_EXTRA_CFLAGS)" \ --arch=arm \ --target-os=linux \ - --bindir=/sbin \ + --bindir=/bin \ $(OPTIONAL) else $(error Boxtype = $(BOXTYPE) not supported) -- 2.39.5