diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:17:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:17:27 +0100 |
| commit | 9e09931fb6a42446c3e370006eb585d0bbd4f501 (patch) | |
| tree | b2cb9a46bf27fbdbc525b27acc24a0dc08430cfc /libavformat/rtpenc.c | |
| parent | 7e5300958885e8d7e81e4e0183580558183a9a5e (diff) | |
| parent | 11edeaea3293c41ecf577a330422eabba35f76a2 (diff) | |
| download | android_external_ffmpeg-9e09931fb6a42446c3e370006eb585d0bbd4f501.tar.gz android_external_ffmpeg-9e09931fb6a42446c3e370006eb585d0bbd4f501.tar.bz2 android_external_ffmpeg-9e09931fb6a42446c3e370006eb585d0bbd4f501.zip | |
Merge commit '11edeaea3293c41ecf577a330422eabba35f76a2'
* commit '11edeaea3293c41ecf577a330422eabba35f76a2':
rtpenc_xiph: Don't exclude headers from max_payload_size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 51cab6f14b..ac5ad8ea60 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -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: |