diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-13 12:23:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-13 12:23:48 +0100 |
| commit | 7897919a88cd4be607497a367203e55fe11df9f0 (patch) | |
| tree | 56727965b7a38e52c63962a1a794b575d991437b /libavformat/rtpproto.c | |
| parent | 2e5e2bf935ae91b3113f480086c0652f17935b0c (diff) | |
| parent | 6d5b0092678b2a95dfe209a207550bd2fe9ef646 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
x86inc: fix stack alignment on win64
rtpproto: Remove unused defines
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpproto.c')
| -rw-r--r-- | libavformat/rtpproto.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index 17b0f64afb..62ec4c9d7d 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -40,9 +40,6 @@ #include <sys/poll.h> #endif -#define RTP_TX_BUF_SIZE (64 * 1024) -#define RTP_RX_BUF_SIZE (128 * 1024) - typedef struct RTPContext { URLContext *rtp_hd, *rtcp_hd; int rtp_fd, rtcp_fd; |