summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/rtp_profile_jpeg.cc32
-rw-r--r--src/srtp.cc2
2 files changed, 20 insertions, 14 deletions
diff --git a/src/rtp_profile_jpeg.cc b/src/rtp_profile_jpeg.cc
index 7aeacc4..9ce667f 100644
--- a/src/rtp_profile_jpeg.cc
+++ b/src/rtp_profile_jpeg.cc
@@ -48,22 +48,26 @@
#include <string>
// For htons
+#ifdef WIN32
+#include <winsock2.h>
+#else
#include <arpa/inet.h>
+#endif
#if 0
-#define GST_LOG(fmt...) printf("\nLOG\t"fmt)
-#define GST_WARNING(fmt...) printf("\nWARN:\t"fmt)
-#define GST_ELEMENT_WARNING(fmt...) printf("\nWARN\t"fmt)
-#define GST_WARNING_OBJECT(fmt...) printf("\nWARN\t"fmt)
-#define GST_LOG_OBJECT(fmt...) printf("\nLOG:\t"fmt)
-#define GST_DEBUG_OBJECT(fmt...) printf("\nDEBUG:\t"fmt)
+#define GST_LOG(fmt, ...) printf("\nLOG\t"fmt)
+#define GST_WARNING(fmt, ...) printf("\nWARN:\t"fmt)
+#define GST_ELEMENT_WARNING(fmt, ...) printf("\nWARN\t"fmt)
+#define GST_WARNING_OBJECT(fmt, ...) printf("\nWARN\t"fmt)
+#define GST_LOG_OBJECT(fmt, ...) printf("\nLOG:\t"fmt)
+#define GST_DEBUG_OBJECT(fmt, ...) printf("\nDEBUG:\t"fmt)
#else
-#define GST_LOG(fmt...)
-#define GST_WARNING(fmt...)
-#define GST_ELEMENT_WARNING(fmt...)
-#define GST_WARNING_OBJECT(fmt...)
-#define GST_LOG_OBJECT(fmt...)
-#define GST_DEBUG_OBJECT(fmt...)
+#define GST_LOG(fmt, ...)
+#define GST_WARNING(fmt, ...)
+#define GST_ELEMENT_WARNING(fmt, ...)
+#define GST_WARNING_OBJECT(fmt, ...)
+#define GST_LOG_OBJECT(fmt, ...)
+#define GST_DEBUG_OBJECT(fmt, ...)
#endif
#define GST_ROUND_UP_8(num) (((num)+7)&~7)
@@ -73,8 +77,10 @@
#define g_htons(x) htons(x)
+#ifndef TRUE
#define TRUE true
#define FALSE false
+#endif
typedef unsigned char guint8;
typedef unsigned int guint;
@@ -829,7 +835,7 @@ gst_rtp_jpeg_pay_handle_buffer(GstRtpJPEGPay *basepayload,
free(payload_base);
//GST_BUFFER_TIMESTAMP (outbuf) = timestamp;
- rtp.setTimestamp(timestamp);
+ rtp.setTimestamp((uint32_t)timestamp);
/* and add to list */
//gst_buffer_list_insert (list, -1, outbuf);
diff --git a/src/srtp.cc b/src/srtp.cc
index a7abd5c..596949d 100644
--- a/src/srtp.cc
+++ b/src/srtp.cc
@@ -28,7 +28,7 @@
#include "srtp.h"
#ifdef WIN32
-#include <include/srtp.h>
+#include <srtp.h>
#else
#include <srtp/srtp.h>
#endif