Skip to content

Commit 6154a5a

Browse files
committed
enable dash demuxer
1 parent b91214e commit 6154a5a

File tree

3 files changed

+29
-1
lines changed

3 files changed

+29
-1
lines changed

configs/ffconfig/module-full.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-demuxer=mpegts"
369369
export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-demuxer=mpegvideo"
370370
export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-demuxer=hevc"
371371
export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-demuxer=h264"
372+
export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-demuxer=dash --enable-libxml2"
372373
export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-demuxer=webm_dash_manifest"
373374
export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-demuxer=avi"
374375
export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-demuxer=rm"

do-compile/ffmpeg.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ fi
9292

9393
# --enable-debug
9494
CFG_FLAGS="$CFG_FLAGS --pkg-config-flags=--static"
95+
# use system xml2 lib
96+
C_FLAGS="$C_FLAGS $(xml2-config --prefix=${XCRUN_SDK_PATH}/usr --cflags)"
97+
LDFLAGS="$C_FLAGS $(xml2-config --prefix=${XCRUN_SDK_PATH}/usr --libs)"
9598

96-
LDFLAGS="$C_FLAGS"
9799
FFMPEG_DEP_LIBS=
98100

99101
# https://ffmpeg.org/doxygen/4.1/md_LICENSE.html
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From dc23b8a00451a1c50ea40088b06f15522cbcb1c5 Mon Sep 17 00:00:00 2001
2+
From: qianlongxu <[email protected]>
3+
Date: Thu, 9 Jan 2025 14:33:04 +0800
4+
Subject: [PATCH 29] change require_pkg_config to check_lib for use system libxml2
5+
6+
---
7+
configure | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/configure b/configure
11+
index 92c69b1..7099ae0 100755
12+
--- a/configure
13+
+++ b/configure
14+
@@ -6881,7 +6881,7 @@ enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h z
15+
enabled libzvbi && require_pkg_config libzvbi zvbi-0.2 libzvbi.h vbi_decoder_new &&
16+
{ test_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" ||
17+
enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; }
18+
-enabled libxml2 && require_pkg_config libxml2 libxml-2.0 libxml2/libxml/xmlversion.h xmlCheckVersion
19+
+enabled libxml2 && check_lib xml2 libxml2/libxml/xmlversion.h xmlCheckVersion -lxml2 #require_pkg_config libxml2 libxml-2.0 libxml2/libxml/xmlversion.h xmlCheckVersion
20+
enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt.h mbedtls_x509_crt_init ||
21+
check_pkg_config mbedtls mbedtls mbedtls/ssl.h mbedtls_ssl_init ||
22+
check_lib mbedtls mbedtls/ssl.h mbedtls_ssl_init -lmbedtls -lmbedx509 -lmbedcrypto ||
23+
--
24+
2.39.5 (Apple Git-154)
25+

0 commit comments

Comments
 (0)