summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/udp_buffer.h9
-rw-r--r--xine_input_vdr_net.h6
2 files changed, 7 insertions, 8 deletions
diff --git a/tools/udp_buffer.h b/tools/udp_buffer.h
index bbd8bd39..6044b794 100644
--- a/tools/udp_buffer.h
+++ b/tools/udp_buffer.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: udp_buffer.h,v 1.5 2009-03-18 21:04:47 phintuka Exp $
+ * $Id: udp_buffer.h,v 1.6 2009-03-24 19:35:23 phintuka Exp $
*
*/
@@ -96,7 +96,7 @@ class cUdpBackLog
delete[] m_UdpBuffer[BufIndex];
m_UdpBuffer[BufIndex] = NULL;
}
-
+
// no buffer ? alloc it
if(!m_UdpBuffer[BufIndex]) {
m_UdpBuffer[BufIndex] = (stream_rtp_header_impl_t*)new uchar[UdpPacketLen];
@@ -131,11 +131,10 @@ class cUdpBackLog
header->hdr_ext.pos = htonull(StreamPos);
header->hdr_ext.seq = htons(m_SeqNo);
- header->hdr_ext.padding1[0] = 0;
- header->hdr_ext.padding1[1] = 0;
+ header->hdr_ext.padding1 = 0;
m_RtpSeqNo = (m_RtpSeqNo + 1) & 0xFFFF;
- m_SeqNo = (m_SeqNo + 1) & UDP_SEQ_MASK;
+ m_SeqNo = (m_SeqNo + 1) & UDP_SEQ_MASK;
return header;
}
diff --git a/xine_input_vdr_net.h b/xine_input_vdr_net.h
index 54dd00e5..adb389aa 100644
--- a/xine_input_vdr_net.h
+++ b/xine_input_vdr_net.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_input_vdr_net.h,v 1.10 2009-02-10 15:15:03 phintuka Exp $
+ * $Id: xine_input_vdr_net.h,v 1.11 2009-03-24 19:35:22 phintuka Exp $
*
*/
@@ -116,12 +116,12 @@ typedef struct stream_rtp_header_ext_x {
union {
struct {
- uint8_t padding0[2]; /* must be padded to full DWORDs */
+ uint16_t padding0; /* must be padded to full DWORDs */
stream_udp_header_t udphdr;
} PACKED;
struct {
- uint8_t padding1[2]; /* must be padded to full DWORDs */
+ uint16_t padding1; /* must be padded to full DWORDs */
uint64_t pos;
uint16_t seq;