generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '11edeaea3293c41ecf577a330422eabba35f76a2'

Browse Source 
* commit '11edeaea3293c41ecf577a330422eabba35f76a2':
  rtpenc_xiph: Don't exclude headers from max_payload_size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-01 01:17:24 +01:00
commit 9e09931fb6
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/rtpenc.c
View File

@ -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:

2
libavformat/rtpenc_xiph.c
View File

@ -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) {