aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-10-13 08:47:34 +0000
committerMartin Storsjö <martin@martin.st>2010-10-13 08:47:34 +0000
commit65cdee9c95d8f97dcb471c346b1afe87a16ee726 (patch)
tree467cda02e46f6932bb77bb28affc18572769e5b4 /libavformat
parentddcf84119141fffd233370837ddbc5bf5d68c87e (diff)
downloadffmpeg-65cdee9c95d8f97dcb471c346b1afe87a16ee726.tar.gz
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
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rtpdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index f9ff972734..0b88afa8b7 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 {