[FFmpeg-cvslog] r25458 - trunk/libavformat/rtpdec.c

mstorsjo subversion
Wed Oct 13 10:13:08 CEST 2010


Author: mstorsjo
Date: Wed Oct 13 10:13:07 2010
New Revision: 25458

Log:
rtpdec: Don't call the depacketizer to return more data unless it actually said it has more data

It may have returned a negative number for an error (e.g. AVERROR(EAGAIN),
if more data is required for it to be able to return a complete packet).

Modified:
   trunk/libavformat/rtpdec.c

Modified: trunk/libavformat/rtpdec.c
==============================================================================
--- trunk/libavformat/rtpdec.c	Wed Oct 13 10:12:23 2010	(r25457)
+++ trunk/libavformat/rtpdec.c	Wed Oct 13 10:13:07 2010	(r25458)
@@ -613,10 +613,10 @@ static int rtp_parse_one_packet(RTPDemux
     int rv= 0;
 
     if (!buf) {
-        /* If parsing of the previous packet actually returned 0, there's
-         * nothing more to be parsed from that packet, but we may have
+        /* If parsing of the previous packet actually returned 0 or an error,
+         * there's nothing more to be parsed from that packet, but we may have
          * indicated that we can return the next enqueued packet. */
-        if (!s->prev_ret)
+        if (s->prev_ret <= 0)
             return rtp_parse_queued_packet(s, pkt);
         /* return the next packets, if any */
         if(s->st && s->parse_packet) {



More information about the ffmpeg-cvslog mailing list