mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-12 02:14:56 +02:00
Merge commit '11edeaea3293c41ecf577a330422eabba35f76a2'
* commit '11edeaea3293c41ecf577a330422eabba35f76a2': rtpenc_xiph: Don't exclude headers from max_payload_size Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9e09931fb6
@ -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:
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user