modules/access/decklink.cpp

@@ -33,6 +33,11 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
+#ifdef _WIN32
+# include <winsock2.h>
+#else
+# include <netinet/in.h>
+#endif
 
 #include "vlc_decklink.h"
 #include <DeckLinkAPIDispatch.cpp>
@@ -281,7 +286,7 @@ public:
             return S_OK;
         }
 
-        BMDPixelFormat fmt = 0;
+        BMDPixelFormat fmt;
         switch (flags) {
             case bmdDetectedVideoInputYCbCr422:
                 fmt = sys->tenbits ? bmdFormat10BitYUV : bmdFormat8BitYUV;

modules/access/sdi.c

@@ -20,6 +20,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "sdi.h"
 
 static inline uint32_t av_le2ne32(uint32_t val)

modules/stream_out/sdi/DBMHelper.cpp

@@ -28,7 +28,14 @@
 
 #include "DBMHelper.hpp"
 
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
+#ifdef _WIN32
+# include <winsock2.h>
+#else
+# include <netinet/in.h>
+#endif
 
 using namespace Decklink;
 

modules/stream_out/sdi/DBMSDIOutput.cpp

@@ -45,7 +45,9 @@
 
 #include "sdiout.hpp"
 
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
 
 #define DECKLINK_CARD_BUFFER (CLOCK_FREQ)
 #define DECKLINK_PREROLL (CLOCK_FREQ*3/4)

modules/stream_out/sdi/DBMSDIOutput.hpp

@@ -65,7 +65,6 @@ namespace sdi_sout
                 BMDTimeValue hardware_reference;
             } clock;
             bool b_running;
-            bool b_prerolled;
             vlc_tick_t streamStartTime;
             int StartPlayback();
             struct

modules/stream_out/sdi/sdiout.cpp

@@ -101,18 +101,6 @@ static const char *const ppsz_videoconns_text[] = {
     "Composite",
     "S-video",
 };
-static const BMDVideoConnection rgbmd_videoconns[] =
-{
-    bmdVideoConnectionSDI,
-    bmdVideoConnectionHDMI,
-    bmdVideoConnectionOpticalSDI,
-    bmdVideoConnectionComponent,
-    bmdVideoConnectionComposite,
-    bmdVideoConnectionSVideo,
-};
-static_assert(ARRAY_SIZE(rgbmd_videoconns) == ARRAY_SIZE(ppsz_videoconns), "videoconn arrays messed up");
-static_assert(ARRAY_SIZE(rgbmd_videoconns) == ARRAY_SIZE(ppsz_videoconns_text), "videoconn arrays messed up");
-
 static const int rgi_afd_values[] = {
     0, 2, 3, 4, 8, 9, 10, 11, 13, 14, 15,
 };