Merge commit 'f668afd4896ee65683619b6f165dda4cdd46766f'

[ffmpeg] / libavformat / rdt.c

diff --git a/libavformat/rdt.c b/libavformat/rdt.c
index ce398963e61c2f48cedab4588d9663c89abeae1d..d6a96de5c1c15498df680e432214b152fb30c3e4 100644 (file)
--- a/libavformat/rdt.c
+++ b/libavformat/rdt.c
@@ -161,16 +161,16 @@ rdt_load_mdpr (PayloadContext *rdt, AVStream *st, int rule_nr)
         num = avio_rb16(&pb);
         if (rule_nr < 0 || rule_nr >= num)
             return -1;
-        avio_seek(&pb, rule_nr * 2, SEEK_CUR);
+        avio_skip(&pb, rule_nr * 2);
         chunk_nr = avio_rb16(&pb);
-        avio_seek(&pb, (num - 1 - rule_nr) * 2, SEEK_CUR);
+        avio_skip(&pb, (num - 1 - rule_nr) * 2);
 
         /* read MDPR chunks */
         num = avio_rb16(&pb);
         if (chunk_nr >= num)
             return -1;
         while (chunk_nr--)
-            avio_seek(&pb, avio_rb32(&pb), SEEK_CUR);
+            avio_skip(&pb, avio_rb32(&pb));
         size = avio_rb32(&pb);
     } else {
         size = rdt->mlti_data_size;
@@ -305,7 +305,7 @@ rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st,
         flags = (flags & RTP_FLAG_KEY) ? 2 : 0;
         res = ff_rm_parse_packet (rdt->rmctx, &pb, st, rdt->rmst[st->index], len, pkt,
                                   &seq, flags, *timestamp);
-        pos = url_ftell(&pb);
+        pos = avio_tell(&pb);
         if (res < 0)
             return res;
         if (res > 0) {