generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Originally committed as revision 25459 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö
2010-10-13 08:13:53 +00:00
parent f6e138b4f4
commit 91ec7aea20
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtpdec.c
View File

@@ -472,7 +472,7 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
/* specific MPEG2TS demux support */ /* specific MPEG2TS demux support */
ret = ff_mpegts_parse_packet(s->ts, pkt, buf, len); ret = ff_mpegts_parse_packet(s->ts, pkt, buf, len);
if (ret < 0) if (ret < 0)
return -1; return ret;
if (ret < len) { if (ret < len) {
s->read_buf_size = len - ret; s->read_buf_size = len - ret;
memcpy(s->buf, buf + ret, s->read_buf_size); memcpy(s->buf, buf + ret, s->read_buf_size);
@@ -630,11 +630,11 @@ static int rtp_parse_one_packet(RTPDemuxContext *s, AVPacket *pkt,
} else { } else {
// TODO: Move to a dynamic packet handler (like above) // TODO: Move to a dynamic packet handler (like above)
if (s->read_buf_index >= s->read_buf_size) 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, ret = ff_mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index,
s->read_buf_size - s->read_buf_index); s->read_buf_size - s->read_buf_index);
if (ret < 0) if (ret < 0)
return -1; return ret;
s->read_buf_index += ret; s->read_buf_index += ret;
if (s->read_buf_index < s->read_buf_size) if (s->read_buf_index < s->read_buf_size)
return 1; return 1;