virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

rtpenc_xiph: Don't exclude headers from max_payload_size

Browse Source 
This makes things more consistent by using the variable in the same
way as in all other packetizers.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2015-02-26 13:39:17 +02:00
parent 7c1e2e6466
commit 11edeaea32
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

@ -223,7 +223,6 @@ static int rtp_write_header(AVFormatContext *s1)
if (!s->max_frames_per_packet) if (!s->max_frames_per_packet)
s->max_frames_per_packet = 15; s->max_frames_per_packet = 15;
s->max_frames_per_packet = av_clip(s->max_frames_per_packet, 1, 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; s->num_frames = 0;
goto defaultcase; goto defaultcase;
case AV_CODEC_ID_ADPCM_G722: case AV_CODEC_ID_ADPCM_G722:

2
libavformat/rtpenc_xiph.c
View File

@ -35,7 +35,7 @@ void ff_rtp_send_xiph(AVFormatContext *s1, const uint8_t *buff, int size)
int max_pkt_size, xdt, frag; int max_pkt_size, xdt, frag;
uint8_t *q; 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 // set xiph data type
switch (*buff) { switch (*buff) {