From f53b9a2964a97f1487c3256a45c1f74ed5910c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 10 Aug 2010 08:37:19 +0000 Subject: [PATCH] rtpenc_xiph: Clarify that num_frames shouldn't ever get larger than max_frames_per_packet Originally committed as revision 24754 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtpenc_xiph.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/rtpenc_xiph.c b/libavformat/rtpenc_xiph.c index 10576c230e..57686326a8 100644 --- a/libavformat/rtpenc_xiph.c +++ b/libavformat/rtpenc_xiph.c @@ -72,8 +72,9 @@ void ff_rtp_send_xiph(AVFormatContext *s1, const uint8_t *buff, int size) uint8_t *ptr = s->buf_ptr + 2 + size; // what we're going to write int remaining = end_ptr - ptr; + assert(s->num_frames <= s->max_frames_per_packet); if ((s->num_frames > 0 && remaining < 0) || - s->num_frames >= s->max_frames_per_packet) { + s->num_frames == s->max_frames_per_packet) { // send previous packets now; no room for new data ff_rtp_send_data(s1, s->buf, s->buf_ptr - s->buf, 0); s->num_frames = 0;