mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpulpfec: fix unconditional use of __attribute__ ((packed))

Browse source 
Fix compilation with MSVC. We still assume that attribute
is supported by all other relevant compilers, which seems
to be the case since we haven't had any complaints about
similar code in rtpsbcpay.
This commit is contained in:
Tim-Philipp Müller 2018-03-17 20:29:35 +00:00
parent 65ede0b565
commit 47ff21ea3b
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/rtp/rtpulpfeccommon.h
View file

@ -48,6 +48,14 @@ typedef struct {
GstRTPBuffer rtp;
} RtpUlpFecMapInfo;
/* FIXME: parse/write these properly instead of relying in packed structs */
#ifdef _MSC_VER
#pragma pack(push, 1)
#define ATTRIBUTE_PACKED
#else
#define ATTRIBUTE_PACKED __attribute__ ((packed))
#endif
/* RFC 5109 */
/*
0 1 2 3
@ -76,7 +84,7 @@ typedef struct {
guint16 seq;
guint32 timestamp;
guint16 len;
} __attribute__ ((packed)) RtpUlpFecHeader;
} ATTRIBUTE_PACKED RtpUlpFecHeader;
#else
typedef struct {
guint8 E:1;
@ -91,7 +99,7 @@ typedef struct {
guint16 seq;
guint32 timestamp;
guint16 len;
} __attribute__ ((packed)) RtpUlpFecHeader;
} ATTRIBUTE_PACKED RtpUlpFecHeader;
#endif
/*
@ -110,7 +118,13 @@ typedef struct
guint16 protection_len;
guint16 mask;
guint32 mask_continued;
} __attribute__ ((packed)) RtpUlpFecLevelHeader;
} ATTRIBUTE_PACKED RtpUlpFecLevelHeader;
#ifdef _MSC_VER
#pragma pack(pop)
#else
#undef ATTRIBUTE_PACKED
#endif
gboolean rtp_ulpfec_map_info_map (GstBuffer *buffer, RtpUlpFecMapInfo *info);
void rtp_ulpfec_map_info_unmap (RtpUlpFecMapInfo *info);