ffmpeg: Enable openh264 & twolame - import from gstreamer PR SynoComm…

…unity#5298

cross/ffmpeg/Makefile

@@ -44,13 +44,15 @@ OPTIONAL_DEPENDS += cross/libass
 OPTIONAL_DEPENDS += cross/libaom
 OPTIONAL_DEPENDS += cross/libvpx
 OPTIONAL_DEPENDS += cross/libzimg
+OPTIONAL_DEPENDS += cross/openh264
 OPTIONAL_DEPENDS += cross/svt-av1
 OPTIONAL_DEPENDS += cross/svt-hevc
 OPTIONAL_DEPENDS += cross/libva
 OPTIONAL_DEPENDS += cross/libva-utils
 OPTIONAL_DEPENDS += cross/intel-vaapi-driver
 OPTIONAL_DEPENDS += cross/intel-media-driver
 OPTIONAL_DEPENDS += cross/intel-media-sdk
+OPTIONAL_DEPENDS += cross/twolame
 OPTIONAL_DEPENDS += cross/x264
 OPTIONAL_DEPENDS += cross/x265
 OPTIONAL_DEPENDS += cross/shine
@@ -105,6 +107,11 @@ CONFIGURE_ARGS += --enable-libzmq
 DEPENDS += cross/gnutls
 CONFIGURE_ARGS += --enable-gnutls
 
+ifneq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
+DEPENDS += cross/openh264
+CONFIGURE_ARGS += --enable-libopenh264
+endif
+
 DEPENDS += cross/opus
 CONFIGURE_ARGS += --enable-libopus
 
@@ -117,6 +124,9 @@ CONFIGURE_ARGS += --enable-libopencore-amrnb --enable-libopencore-amrwb
 DEPENDS += cross/librabbitmq
 CONFIGURE_ARGS += --enable-librabbitmq
 
+DEPENDS += cross/twolame
+CONFIGURE_ARGS += --enable-libtwolame
+
 DEPENDS += cross/zvbi
 CONFIGURE_ARGS += --enable-libzvbi
 
@@ -166,14 +176,6 @@ endif
 DEPENDS += cross/fdk-aac
 CONFIGURE_ARGS += --enable-libfdk-aac --enable-nonfree
 
-ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
-ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
-# libass requires harfbuzz which in turns requires c++ from gcc >= 4.8 (88f6281-6.1 = gcc-4.6.4)
-DEPENDS += cross/libass
-CONFIGURE_ARGS += --enable-libass
-endif
-endif
-
 ifeq ($(findstring $(ARCH),alpine comcerto2k monaco $(ARMv8_ARCHS) $(i686_ARCHS) $(x64_ARCHS)),$(ARCH))
 DEPENDS += cross/libaom
 CONFIGURE_ARGS += --enable-libaom
@@ -194,6 +196,12 @@ endif
 
 include ../../mk/spksrc.cross-cc.mk
 
+# libass requires harfbuzz which in turns requires c++ from gcc >= 4.8 (88f6281-6.1 = gcc-4.6.4)
+ifeq ($(call version_ge, $(TC_GCC), 4.8),1)
+DEPENDS += cross/libass
+CONFIGURE_ARGS += --enable-libass
+endif
+
 ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
 CONFIGURE_ARGS += --arch=arm --disable-neon --disable-asm
 endif
@@ -220,7 +228,6 @@ CONFIGURE_ARGS += --cpu=e500 --disable-altivec
 endif
 endif
 
-
 ifeq ($(findstring $(ARCH),$(i686_ARCHS) $(x64_ARCHS)),$(ARCH))
 BUILD_DEPENDS = native/nasm
 NASM_PATH = $(realpath $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin)