[FFmpeg-cvslog] rtpdec: Always check if we have the next packet queued

Martin Storsjö git at videolan.org
Tue Jun 21 22:25:33 CEST 2016


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Jan 14 17:48:26 2013 +0200| [9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a] | committer: Martin Storsjö

rtpdec: Always check if we have the next packet queued

It doesn't matter what the actual reason for not returning
an AVPacket was - if we didn't return any packet and we have
the next one queued, parse it immediately. (rtp_parse_queued_packet
always consumes a queued packet if one exists, so there's no risk
for infinite loops.)

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a
---

 libavformat/rtpdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index ef51993..2512239 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -837,7 +837,7 @@ int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
         return -1;
     rv = rtp_parse_one_packet(s, pkt, bufptr, len);
     s->prev_ret = rv;
-    while (rv == AVERROR(EAGAIN) && has_next_packet(s))
+    while (rv < 0 && has_next_packet(s))
         rv = rtp_parse_queued_packet(s, pkt);
     return rv ? rv : has_next_packet(s);
 }



More information about the ffmpeg-cvslog mailing list