Skip to content

Commit 6343b0d

Browse files
committed
rtmfp fixes
1 parent 534faba commit 6343b0d

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

cross_compile_ffmpeg.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,7 @@ build_librtmfp() {
852852
cd librtmfp_git
853853
if [[ $compiler_flavors != "native" ]]; then
854854
apply_patch file://$patch_dir/rtmfp.static.cross.patch -p1 # works e48efb4f
855+
apply_patch file://$patch_dir/rtmfp_capitalization.diff -p1 # cross for windows needs it if on linux...
855856
else
856857
apply_patch file://$patch_dir/rtfmp.static.make.patch -p1
857858
fi
@@ -860,7 +861,7 @@ build_librtmfp() {
860861
if [[ $compiler_flavors == "native" ]]; then
861862
sed -i.bak 's/-lrtmfp.*/-lrtmfp -lstdc++/' "$PKG_CONFIG_PATH/librtmfp.pc"
862863
else
863-
sed -i.bak 's/-lrtmfp.*/-lrtmfp -lstdc++ -lWs2_32 -liphlpapi/' "$PKG_CONFIG_PATH/librtmfp.pc"
864+
sed -i.bak 's/-lrtmfp.*/-lrtmfp -lstdc++ -lws2_32 -liphlpapi/' "$PKG_CONFIG_PATH/librtmfp.pc"
864865
fi
865866
cd ..
866867
}

patches/rtmfp_capitalization.diff

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/sources/Base/IPAddress.cpp b/sources/Base/IPAddress.cpp
2+
index 530bd59..291a428 100644
3+
--- a/sources/Base/IPAddress.cpp
4+
+++ b/sources/Base/IPAddress.cpp
5+
@@ -19,7 +19,7 @@ details (or else see http://mozilla.org/MPL/2.0/).
6+
#include "Base/DNS.h"
7+
#include "Base/Util.h"
8+
#if defined(_WIN32)
9+
-#include <Iphlpapi.h>
10+
+#include <iphlpapi.h>
11+
#elif !defined(__ANDROID__)
12+
#include <ifaddrs.h>
13+
#endif
14+
diff --git a/sources/Base/Net.cpp b/sources/Base/Net.cpp
15+
index 4884276..a6f95f0 100644
16+
--- a/sources/Base/Net.cpp
17+
+++ b/sources/Base/Net.cpp
18+
@@ -17,7 +17,7 @@ details (or else see http://mozilla.org/MPL/2.0/).
19+
#include "Base/Net.h"
20+
#include "Base/SocketAddress.h"
21+
#if defined(_WIN32)
22+
-#include <Iphlpapi.h>
23+
+#include <iphlpapi.h>
24+
#else
25+
#include <net/if.h>
26+
#include <ifaddrs.h>

0 commit comments

Comments
 (0)