From c4f5ee013dea3d12ece390a72fb06647babe73ba Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 29 Sep 2019 19:05:10 +0200 Subject: [PATCH] bumb version ffmpeg-4.2.1 --enable-libxml2 --enable-libfreetype --- make/ffmpeg.mk | 14 +++++++++----- make/versions.mk | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/make/ffmpeg.mk b/make/ffmpeg.mk index 3e75670..19c8422 100644 --- a/make/ffmpeg.mk +++ b/make/ffmpeg.mk @@ -392,11 +392,17 @@ FFMPEG_CONFIGURE = \ --enable-filter=scale \ --enable-filter=drawtext \ \ + --enable-bsfs \ + --enable-libass \ + --enable-libbluray \ + --enable-libfreetype \ + --enable-librtmp \ + --enable-network \ + --enable-nonfree \ + --enable-openssl \ + --enable-libxml2 \ --enable-zlib \ --disable-bzlib \ - --enable-openssl \ - --enable-libass \ - --enable-bsfs \ --disable-xlib \ --disable-libxcb \ --disable-libxcb-shm \ @@ -404,8 +410,6 @@ FFMPEG_CONFIGURE = \ --disable-libxcb-shape \ \ --enable-shared \ - --enable-network \ - --enable-nonfree \ --enable-small \ --enable-stripping \ --disable-static \ diff --git a/make/versions.mk b/make/versions.mk index ba97229..c632ba7 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -71,7 +71,7 @@ FBSHOT_VER = 0.3 # FFMPEG | A complete, cross-platform solution to record, convert and stream audio and video ifeq ($(BOXTYPE), armbox) -FFMPEG_VER = 4.2 +FFMPEG_VER = 4.2.1 else FFMPEG_GIT = 2ba896f endif -- 2.39.5