Change status packet skipping to be more spec-compliant. See discussion in

"[PATCH] RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15836 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rdt.c b/libavformat/rdt.c
index b44ede94b428dffcb0dc953ef520a8b7efa0f691..0982d62a1f48a4dfbfec9a56d2438ddb46bdce72 100644 (file)
--- a/libavformat/rdt.c
+++ b/libavformat/rdt.c
@@ -178,10 +178,17 @@ ff_rdt_parse_header(const uint8_t *buf, int len,
 {
     int consumed = 10;
 
-    if (len > 0 && (buf[0] < 0x40 || buf[0] > 0x42)) {
-        buf += 9;
-        len -= 9;
-        consumed += 9;
+    /* skip status packets */
+    while (len >= 5 && buf[1] == 0xFF /* status packet */) {
+        int pkt_len;
+
+        if (!(buf[0] & 0x80))
+            return -1; /* not followed by a data packet */
+
+        pkt_len = AV_RB16(buf+3);
+        buf += pkt_len;
+        len -= pkt_len;
+        consumed += pkt_len;
     }
     if (len < 10)
         return -1;