Unverified Commit 59b5fc31 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #8402 from andrewvoznytsa/pr-tcp-ios-fix

Fix TCP for Android and iOS
parents b41ace5c 08cc4fdb
...@@ -93,6 +93,7 @@ static void qt_gst_log(GstDebugCategory * category, ...@@ -93,6 +93,7 @@ static void qt_gst_log(GstDebugCategory * category,
GST_PLUGIN_STATIC_DECLARE(matroska); GST_PLUGIN_STATIC_DECLARE(matroska);
GST_PLUGIN_STATIC_DECLARE(mpegtsdemux); GST_PLUGIN_STATIC_DECLARE(mpegtsdemux);
GST_PLUGIN_STATIC_DECLARE(opengl); GST_PLUGIN_STATIC_DECLARE(opengl);
GST_PLUGIN_STATIC_DECLARE(tcp);
#if defined(__android__) #if defined(__android__)
GST_PLUGIN_STATIC_DECLARE(androidmedia); GST_PLUGIN_STATIC_DECLARE(androidmedia);
#elif defined(__ios__) #elif defined(__ios__)
...@@ -167,6 +168,7 @@ void initializeVideoStreaming(int &argc, char* argv[], int gstDebuglevel) ...@@ -167,6 +168,7 @@ void initializeVideoStreaming(int &argc, char* argv[], int gstDebuglevel)
GST_PLUGIN_STATIC_REGISTER(matroska); GST_PLUGIN_STATIC_REGISTER(matroska);
GST_PLUGIN_STATIC_REGISTER(mpegtsdemux); GST_PLUGIN_STATIC_REGISTER(mpegtsdemux);
GST_PLUGIN_STATIC_REGISTER(opengl); GST_PLUGIN_STATIC_REGISTER(opengl);
GST_PLUGIN_STATIC_REGISTER(tcp);
#if defined(__android__) #if defined(__android__)
GST_PLUGIN_STATIC_REGISTER(androidmedia); GST_PLUGIN_STATIC_REGISTER(androidmedia);
......
...@@ -91,7 +91,8 @@ LinuxBuild { ...@@ -91,7 +91,8 @@ LinuxBuild {
-lgstmatroska \ -lgstmatroska \
-lgstmpegtsdemux \ -lgstmpegtsdemux \
-lgstandroidmedia \ -lgstandroidmedia \
-lgstopengl -lgstopengl \
-lgsttcp
# Rest of GStreamer dependencies # Rest of GStreamer dependencies
LIBS += -L$$GST_ROOT/lib \ LIBS += -L$$GST_ROOT/lib \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment