rtpenc_xiph: Clarify that num_frames shouldn't ever get larger than max_frames_per_packet
authorMartin Storsjö <martin@martin.st>
Tue, 10 Aug 2010 08:37:19 +0000 (08:37 +0000)
committerMartin Storsjö <martin@martin.st>
Tue, 10 Aug 2010 08:37:19 +0000 (08:37 +0000)
Originally committed as revision 24754 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/rtpenc_xiph.c

index 10576c2..5768632 100644 (file)
@@ -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;
 
         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) ||
         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;
             // 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;