Browse Source

rtpenc_xiph: Don't exclude headers from max_payload_size

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>
tags/n2.6
Martin Storsjö 10 years ago
parent
commit
11edeaea32
2 changed files with 1 additions and 2 deletions
  1. +0
    -1
      libavformat/rtpenc.c
  2. +1
    -1
      libavformat/rtpenc_xiph.c

+ 0
- 1
libavformat/rtpenc.c View File

@@ -223,7 +223,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:


+ 1
- 1
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;
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…
Cancel
Save