From f8e5b9a4a0d7137556037a4f14f1dd8baf9fc82e Mon Sep 17 00:00:00 2001
From: max_10 <max_10@gmx.de>
Date: Wed, 29 Aug 2018 14:29:29 +0200
Subject: [PATCH] [libarmbox] add libeplayer3-arm --enable-flv2mpeg4

---
 acinclude.m4                |  6 +++---
 configure.ac                |  9 +++++++++
 libeplayer3-arm/Makefile.am | 14 ++++++++------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index b9d9be1..6b9232b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -152,11 +152,11 @@ AC_SUBST(PLUGINDIR)
 AC_SUBST(THEMESDIR)
 dnl end workaround
 
-AC_DEFUN([TUXBOX_BOXTYPE],[
+AC_DEFUN([TUXBOX_BOXTYPE], [
 AC_ARG_WITH(boxtype,
-	[  --with-boxtype          valid values: tripledragon,spark,azbox,generic,duckbox,spark7162,armbox],
+	AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, spark, azbox, generic, armbox, duckbox, spark7162]),
 	[case "${withval}" in
-		tripledragon|azbox|generic)
+		tripledragon|azbox|generic|armbox)
 			BOXTYPE="$withval"
 		;;
 		spark|spark7162)
diff --git a/configure.ac b/configure.ac
index f6bf9fe..0775f23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,6 +62,15 @@ if test x$BOXTYPE = xgeneric -a x$BOXMODEL != xraspi; then
 	PKG_CHECK_MODULES([SWRESAMPLE], [libswresample])
 fi
 
+AC_ARG_ENABLE(flv2mpeg4,
+	AS_HELP_STRING(--enable-flv2mpeg4, use flv2mpeg4 libeplayer3-arm),
+	,[enable_flv2mpeg4=no])
+
+AM_CONDITIONAL(FLV2MPEG4, test "$enable_flv2mpeg4" = "yes")
+if test "$enable_flv2mpeg4" = "yes"; then
+	AC_DEFINE(ENABLE_FLV2MPEG4, 1, [use flv2mpeg4 libeplayer3-arm])
+fi
+
 AC_OUTPUT([
 Makefile
 common/Makefile
diff --git a/libeplayer3-arm/Makefile.am b/libeplayer3-arm/Makefile.am
index 0db258d..193f427 100644
--- a/libeplayer3-arm/Makefile.am
+++ b/libeplayer3-arm/Makefile.am
@@ -29,12 +29,14 @@ SOURCE_FILES += external/ffmpeg/src/bitstream.c
 SOURCE_FILES += external/ffmpeg/src/latmenc.c
 SOURCE_FILES += external/ffmpeg/src/mpeg4audio.c
 
-#AM_CFLAGS    += -DHAVE_FLV2MPEG4_CONVERTER
-#AM_CPPFLAGS  += -I$(srcdir)/external/flv2mpeg4
-#SOURCE_FILES += external/flv2mpeg4/src/m4vencode.c
-#SOURCE_FILES += external/flv2mpeg4/src/flvdecoder.c
-#SOURCE_FILES += external/flv2mpeg4/src/dcprediction.c
-#SOURCE_FILES += external/flv2mpeg4/src/flv2mpeg4.c
+if ENABLE_FLV2MPEG4
+AM_CFLAGS    += -DHAVE_FLV2MPEG4_CONVERTER
+AM_CPPFLAGS  += -I$(srcdir)/external/flv2mpeg4
+SOURCE_FILES += external/flv2mpeg4/src/m4vencode.c
+SOURCE_FILES += external/flv2mpeg4/src/flvdecoder.c
+SOURCE_FILES += external/flv2mpeg4/src/dcprediction.c
+SOURCE_FILES += external/flv2mpeg4/src/flv2mpeg4.c
+endif
 
 SOURCE_FILES += \
 	output/linuxdvb_mipsel.c \