Revision a2704c97 libavformat/rtpdec_asf.c

View differences:

libavformat/rtpdec_asf.c
114 114
        if (ret < 0)
115 115
            return ret;
116 116
        av_metadata_copy(&s->metadata, rt->asf_ctx->metadata, 0);
117
        rt->asf_pb_pos = url_ftell(&pb);
117
        rt->asf_pb_pos = avio_tell(&pb);
118 118
        av_free(buf);
119 119
        rt->asf_ctx->pb = NULL;
120 120
    }
......
179 179

  
180 180
        ffio_init_context(pb, buf, len, 0, NULL, NULL, NULL, NULL);
181 181

  
182
        while (url_ftell(pb) + 4 < len) {
183
            int start_off = url_ftell(pb);
182
        while (avio_tell(pb) + 4 < len) {
183
            int start_off = avio_tell(pb);
184 184

  
185 185
            mflags = avio_r8(pb);
186 186
            if (mflags & 0x80)
......
192 192
                avio_seek(pb, 4, SEEK_CUR);
193 193
            if (mflags & 0x8)    /**< has location ID */
194 194
                avio_seek(pb, 4, SEEK_CUR);
195
            off = url_ftell(pb);
195
            off = avio_tell(pb);
196 196

  
197 197
            if (!(mflags & 0x40)) {
198 198
                /**
......
201 201
                 * ASF packet. This is used to spread one ASF packet over
202 202
                 * multiple RTP packets.
203 203
                 */
204
                if (asf->pktbuf && len_off != url_ftell(asf->pktbuf)) {
204
                if (asf->pktbuf && len_off != avio_tell(asf->pktbuf)) {
205 205
                    uint8_t *p;
206 206
                    url_close_dyn_buf(asf->pktbuf, &p);
207 207
                    asf->pktbuf = NULL;
......
248 248
        int i;
249 249

  
250 250
        res = av_read_packet(rt->asf_ctx, pkt);
251
        rt->asf_pb_pos = url_ftell(pb);
251
        rt->asf_pb_pos = avio_tell(pb);
252 252
        if (res != 0)
253 253
            break;
254 254
        for (i = 0; i < s->nb_streams; i++) {

Also available in: Unified diff