[SCM] libav/experimental: rtpdec: Don't use the no reordering codepath if there already is a queue

[siretart at users.alioth.debian.org]

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

    rtpdec: Don't use the no reordering codepath if there already is a queue
    
    Originally committed as revision 25462 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index f9ff972..0b88afa 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -652,7 +652,7 @@ static int rtp_parse_one_packet(RTPDemuxContext *s, AVPacket *pkt,
         return rtcp_parse_packet(s, buf, len);
     }
 
-    if (s->seq == 0 || s->queue_size <= 1) {
+    if ((s->seq == 0 && !s->queue) || s->queue_size <= 1) {
         /* First packet, or no reordering */
         return rtp_parse_packet_internal(s, pkt, buf, len);
     } else {

-- 
Libav/FFmpeg packaging