Merge branch 'mannol-master'

This commit is contained in:
irungentoo 2016-01-15 15:35:12 -05:00
commit 47c1e5fa43
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98

View File

@ -65,7 +65,7 @@ struct RTPHeader {
} __attribute__ ((packed));
/* Check alignment */
typedef char __fail_if_misaligned [ sizeof(struct RTPHeader) == 80 ? 1 : -1 ];
typedef char __fail_if_misaligned_1 [ sizeof(struct RTPHeader) == 80 ? 1 : -1 ];
struct RTPMessage {
uint16_t len;
@ -75,7 +75,7 @@ struct RTPMessage {
} __attribute__ ((packed));
/* Check alignment */
typedef char __fail_if_misaligned [ sizeof(struct RTPMessage) == 82 ? 1 : -1 ];
typedef char __fail_if_misaligned_2 [ sizeof(struct RTPMessage) == 82 ? 1 : -1 ];
/**
* RTP control session.