bumb version ffmpeg-4.2.1

--enable-libxml2
--enable-libfreetype

diff --git a/make/ffmpeg.mk b/make/ffmpeg.mk
index 3e756704802210623cb6337724e5bbc54bb7f533..19c8422ff4e10ffe47d7ad86646167c92e90b312 100644 (file)
--- 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 ba97229f3a777713e7267ad509a02b21f44f7454..c632ba7620b412f6f5b8383ceb3616c7e55cec7f 100644 (file)
--- 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