[FFmpeg-cvslog] Merge commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Tue Jun 21 22:24:30 2016 +0200| [4873952f886b718810e5ecf2ef26ca53173e9935] | committer: Clément Bœsch

Merge commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a'

* commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a':
  rtpdec: Always check if we have the next packet queued

Merged-by: Clément Bœsch <u at pkh.me>

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

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

diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index eef6160..786be9f 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -845,7 +845,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);
 }


======================================================================