diff options
| author | Martin Storsjö <martin@martin.st> | 2015-02-26 13:39:17 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-02-28 22:54:04 +0200 |
| commit | 11edeaea3293c41ecf577a330422eabba35f76a2 (patch) | |
| tree | 23cd71f701156b97b696f30bd34928bc9f258b6c | |
| parent | 7c1e2e64667421f931ab48141517f19d309c7eea (diff) | |
| download | ffmpeg-11edeaea3293c41ecf577a330422eabba35f76a2.tar.gz | |
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>
| -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 cfa5f348fd..ae1d3e04c6 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -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: diff --git a/libavformat/rtpenc_xiph.c b/libavformat/rtpenc_xiph.c index ef31c048de..7d8883a353 100644 --- a/libavformat/rtpenc_xiph.c +++ b/libavformat/rtpenc_xiph.c @@ -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) { |