[SCM] libav/experimental: rtpdec: Return AVERROR(EAGAIN) if out of data for mpegts, pass returned error codes through

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 91ec7aea206a7128a31e3e3d7f2c15c59e1c41d3
Author: Martin Storsjö <martin at martin.st>
Date:   Wed Oct 13 08:13:53 2010 +0000

    rtpdec: Return AVERROR(EAGAIN) if out of data for mpegts, pass returned error codes through
    
    Originally committed as revision 25459 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 240229a..ed2d0a4 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -472,7 +472,7 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
         /* 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(RTPDemuxContext *s, AVPacket *pkt,
         } 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;

-- 
Libav/FFmpeg packaging