diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:17:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:17:27 +0100 |
| commit | 9e09931fb6a42446c3e370006eb585d0bbd4f501 (patch) | |
| tree | b2cb9a46bf27fbdbc525b27acc24a0dc08430cfc | |
| parent | 7e5300958885e8d7e81e4e0183580558183a9a5e (diff) | |
| parent | 11edeaea3293c41ecf577a330422eabba35f76a2 (diff) | |
| download | ffmpeg-9e09931fb6a42446c3e370006eb585d0bbd4f501.tar.gz | |
Merge commit '11edeaea3293c41ecf577a330422eabba35f76a2'
* commit '11edeaea3293c41ecf577a330422eabba35f76a2':
rtpenc_xiph: Don't exclude headers from max_payload_size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpenc.c | 1 | ||||
| -rw-r--r-- | libavformat/rtpenc_xiph.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 51cab6f14b..ac5ad8ea60 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -226,7 +226,6 @@ static int rtp_write_header(AVFormatContext *s1) if (!s->max_frames_per_packet) s->max_frames_per_packet = 15; s->max_frames_per_packet = av_clip(s->max_frames_per_packet, 1, 15); - s->max_payload_size -= 6; // ident+frag+tdt/vdt+pkt_num+pkt_length s->num_frames = 0; goto defaultcase; case AV_CODEC_ID_ADPCM_G722: diff --git a/libavformat/rtpenc_xiph.c b/libavformat/rtpenc_xiph.c index d5936774ba..0564b06531 100644 --- a/libavformat/rtpenc_xiph.c +++ b/libavformat/rtpenc_xiph.c @@ -36,7 +36,7 @@ void ff_rtp_send_xiph(AVFormatContext *s1, const uint8_t *buff, int size) int max_pkt_size, xdt, frag; uint8_t *q; - max_pkt_size = s->max_payload_size; + max_pkt_size = s->max_payload_size - 6; // ident+frag+tdt/vdt+pkt_num+pkt_length // set xiph data type switch (*buff) { |