diff options
| author | mannol <eniz_vukovic@hotmail.com> | 2014-07-21 04:10:05 +0200 |
|---|---|---|
| committer | mannol <eniz_vukovic@hotmail.com> | 2014-07-21 04:10:05 +0200 |
| commit | 79115259a81dc958041f18573f34299c083cebea (patch) | |
| tree | 594fbf60dc01e2aa78c775c4e2d9977c5b18752f /toxav/rtp.c | |
| parent | 2ca2baf120c5dd4dcdd9c450ef35560b0726136f (diff) | |
| parent | b63e4ad88fb93820fb740372f36d74c65b8b7b81 (diff) | |
Fixed conflicts
Diffstat (limited to 'toxav/rtp.c')
| -rw-r--r-- | toxav/rtp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/toxav/rtp.c b/toxav/rtp.c index 8b94bda7..17319f81 100644 --- a/toxav/rtp.c +++ b/toxav/rtp.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include "rtp.h" | 29 | #include "rtp.h" |
| 30 | #include <stdlib.h> | 30 | #include <stdlib.h> |
| 31 | void toxav_handle_packet(RTPSession *_session, RTPMessage *_msg); | ||
| 31 | 32 | ||
| 32 | #define size_32 4 | 33 | #define size_32 4 |
| 33 | 34 | ||