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

[mstorsjo]

Author: mstorsjo
Date: Wed Oct 13 10:13:53 2010
New Revision: 25459

Log:
rtpdec: Return AVERROR(EAGAIN) if out of data for mpegts, pass returned error codes through

Modified:
   trunk/libavformat/rtpdec.c

Modified: trunk/libavformat/rtpdec.c
==============================================================================
--- trunk/libavformat/rtpdec.c	Wed Oct 13 10:13:07 2010	(r25458)
+++ trunk/libavformat/rtpdec.c	Wed Oct 13 10:13:53 2010	(r25459)
@@ -472,7 +472,7 @@ static int rtp_parse_packet_internal(RTP
         /* specific MPEG2TS demux support */
         ret = ff_mpegts_parse_packet(s->ts, pkt, buf, len);
         if (ret < 0)
-            return -1;
+            return ret;
         if (ret < len) {
             s->read_buf_size = len - ret;
             memcpy(s->buf, buf + ret, s->read_buf_size);
@@ -630,11 +630,11 @@ static int rtp_parse_one_packet(RTPDemux
         } else {
             // TODO: Move to a dynamic packet handler (like above)
             if (s->read_buf_index >= s->read_buf_size)
-                return -1;
+                return AVERROR(EAGAIN);
             ret = ff_mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index,
                                       s->read_buf_size - s->read_buf_index);
             if (ret < 0)
-                return -1;
+                return ret;
             s->read_buf_index += ret;
             if (s->read_buf_index < s->read_buf_size)
                 return 1;