[Build-System] Fix switch_packetizer headers and add it to the build.

diff --git a/Makefile.am b/Makefile.am
index e9fb74c6468242f34554c5fa13060f68ea45a077..3bf9cbd0484a116b6ab1349278afd618fb87b35c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -300,6 +300,7 @@ library_include_HEADERS = \
        src/include/switch_dso.h \
        src/include/switch_loadable_module.h \
        src/include/switch_module_interfaces.h \
+       src/include/switch_packetizer.h \
        src/include/switch_platform.h \
        src/include/switch_resample.h \
        src/include/switch_regex.h \

diff --git a/src/include/switch.h b/src/include/switch.h
index 9fdbf12aa66b3f7c101f9c9fb24b0f7b90616021..461914c93b739d70e8d17d21a1616f1f4a450a18 100644 (file)
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -136,6 +136,7 @@
 #include "switch_core_event_hook.h"
 #include "switch_scheduler.h"
 #include "switch_config.h"
+#include "switch_packetizer.h"
 #include "switch_nat.h"
 #include "switch_odbc.h"
 #include "switch_json.h"

diff --git a/src/include/switch_packetizer.h b/src/include/switch_packetizer.h
index 39cdf4f4d6e4c4c5bbba1cd5349020069a376376..b6079d6c08f74b23b6c963b2c1397562ab18fd12 100644 (file)
--- a/src/include/switch_packetizer.h
+++ b/src/include/switch_packetizer.h
@@ -29,8 +29,6 @@
  *
  */
 
-#include <switch.h>
-
 #ifndef SWITCH_PACKETIZER_H
 #define SWITCH_PACKETIZER_H
 

diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c
index 96684d3d28e571edde1c2ca00b309e34bf821f21..4ae98a15945057c7378e5ea4107fb1a85dfa7c95 100644 (file)
--- a/src/mod/applications/mod_av/avformat.c
+++ b/src/mod/applications/mod_av/avformat.c
@@ -54,7 +54,6 @@ GCC_DIAG_OFF(deprecated-declarations)
 #include <libswresample/swresample.h>
 #endif
 
-#include <switch_packetizer.h>
 #define SLICE_SIZE (SWITCH_DEFAULT_VIDEO_SIZE + 100)
 
 GCC_DIAG_ON(deprecated-declarations)

diff --git a/src/switch_packetizer.c b/src/switch_packetizer.c
index e539bd9b59f006cc40d9e1e521dce771a29b4b23..05688f8a86b2fd73b18017c7436acb6ed2d5240b 100644 (file)
--- a/src/switch_packetizer.c
+++ b/src/switch_packetizer.c
@@ -29,7 +29,7 @@
  *
  */
 
-#include <switch_packetizer.h>
+#include <switch.h>
 #define MAX_NALUS 256
 
 typedef struct our_h264_nalu_s {

diff --git a/w32/Library/FreeSwitchCore.2017.vcxproj b/w32/Library/FreeSwitchCore.2017.vcxproj
index a21da723ccd4affef5b2605443d6efec377593eb..9d7098ee5e0b31c2e7f558e1076e7f0efd5213d9 100644 (file)
--- a/w32/Library/FreeSwitchCore.2017.vcxproj
+++ b/w32/Library/FreeSwitchCore.2017.vcxproj
@@ -400,6 +400,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
     <ClCompile Include="..\..\src\switch_odbc.c" />\r
     <ClCompile Include="..\..\src\switch_pcm.c" />\r
     <ClCompile Include="..\..\src\switch_speex.c" />\r
+    <ClCompile Include="..\..\src\switch_packetizer.c" />\r
     <ClCompile Include="..\..\src\switch_profile.c" />\r
     <ClCompile Include="..\..\src\switch_regex.c" />\r
     <ClCompile Include="..\..\src\switch_resample.c" />\r
@@ -735,6 +736,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
     <ClInclude Include="..\..\src\include\switch_module_interfaces.h" />\r
     <ClInclude Include="..\..\src\include\switch_mprintf.h" />\r
     <ClInclude Include="..\..\src\include\switch_odbc.h" />\r
+    <ClInclude Include="..\..\src\include\switch_packetizer.h" />\r
     <ClInclude Include="..\..\src\include\switch_platform.h" />\r
     <ClInclude Include="..\..\src\include\switch_regex.h" />\r
     <ClInclude Include="..\..\src\include\switch_resample.h" />\r