Revision f59d8ff8 libavformat/matroskadec.c

View differences:

libavformat/matroskadec.c
831 831
                     return ebml_parse_nest(matroska, syntax->def.n, data);
832 832
    case EBML_PASS:  return ebml_parse_id(matroska, syntax->def.n, id, data);
833 833
    case EBML_STOP:  return 1;
834
    default:         return url_fseek(pb,length,SEEK_CUR)<0 ? AVERROR(EIO) : 0;
834
    default:         return avio_seek(pb,length,SEEK_CUR)<0 ? AVERROR(EIO) : 0;
835 835
    }
836 836
    if (res == AVERROR_INVALIDDATA)
837 837
        av_log(matroska->ctx, AV_LOG_ERROR, "Invalid element\n");
......
1130 1130
            continue;
1131 1131

  
1132 1132
        /* seek */
1133
        if (url_fseek(matroska->ctx->pb, offset, SEEK_SET) != offset)
1133
        if (avio_seek(matroska->ctx->pb, offset, SEEK_SET) != offset)
1134 1134
            continue;
1135 1135

  
1136 1136
        /* We don't want to lose our seekhead level, so we add
......
1159 1159
    }
1160 1160

  
1161 1161
    /* seek back */
1162
    url_fseek(matroska->ctx->pb, before_pos, SEEK_SET);
1162
    avio_seek(matroska->ctx->pb, before_pos, SEEK_SET);
1163 1163
    matroska->level_up = level_up;
1164 1164
    matroska->current_id = saved_id;
1165 1165
}
......
1889 1889
    timestamp = FFMAX(timestamp, st->index_entries[0].timestamp);
1890 1890

  
1891 1891
    if ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) {
1892
        url_fseek(s->pb, st->index_entries[st->nb_index_entries-1].pos, SEEK_SET);
1892
        avio_seek(s->pb, st->index_entries[st->nb_index_entries-1].pos, SEEK_SET);
1893 1893
        while ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) {
1894 1894
            matroska_clear_queue(matroska);
1895 1895
            if (matroska_parse_cluster(matroska) < 0)
......
1914 1914
        }
1915 1915
    }
1916 1916

  
1917
    url_fseek(s->pb, st->index_entries[index_min].pos, SEEK_SET);
1917
    avio_seek(s->pb, st->index_entries[index_min].pos, SEEK_SET);
1918 1918
    matroska->skip_to_keyframe = !(flags & AVSEEK_FLAG_ANY);
1919 1919
    matroska->skip_to_timecode = st->index_entries[index].timestamp;
1920 1920
    matroska->done = 0;

Also available in: Unified diff