Revision e63a3628 libavformat/vqf.c

View differences:

libavformat/vqf.c
54 54
    buf = av_malloc(len+1);
55 55
    if (!buf)
56 56
        return;
57
    get_buffer(s->pb, buf, len);
57
    avio_read(s->pb, buf, len);
58 58
    buf[len] = 0;
59 59
    av_metadata_set2(&s->metadata, tag, buf, AV_METADATA_DONT_STRDUP_VAL);
60 60
}
......
74 74

  
75 75
    url_fskip(s->pb, 12);
76 76

  
77
    header_size = get_be32(s->pb);
77
    header_size = avio_rb32(s->pb);
78 78

  
79 79
    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
80 80
    st->codec->codec_id   = CODEC_ID_TWINVQ;
......
82 82

  
83 83
    do {
84 84
        int len;
85
        chunk_tag = get_le32(s->pb);
85
        chunk_tag = avio_rl32(s->pb);
86 86

  
87 87
        if (chunk_tag == MKTAG('D','A','T','A'))
88 88
            break;
89 89

  
90
        len = get_be32(s->pb);
90
        len = avio_rb32(s->pb);
91 91

  
92 92
        if ((unsigned) len > INT_MAX/2) {
93 93
            av_log(s, AV_LOG_ERROR, "Malformed header\n");
......
98 98

  
99 99
        switch(chunk_tag){
100 100
        case MKTAG('C','O','M','M'):
101
            st->codec->channels = get_be32(s->pb) + 1;
102
            read_bitrate        = get_be32(s->pb);
103
            rate_flag           = get_be32(s->pb);
101
            st->codec->channels = avio_rb32(s->pb) + 1;
102
            read_bitrate        = avio_rb32(s->pb);
103
            rate_flag           = avio_rb32(s->pb);
104 104
            url_fskip(s->pb, len-12);
105 105

  
106 106
            st->codec->bit_rate              = read_bitrate*1000;
......
208 208

  
209 209
    pkt->data[0] = 8 - c->remaining_bits; // Number of bits to skip
210 210
    pkt->data[1] = c->last_frame_bits;
211
    ret = get_buffer(s->pb, pkt->data+2, size);
211
    ret = avio_read(s->pb, pkt->data+2, size);
212 212

  
213 213
    if (ret<=0) {
214 214
        av_free_packet(pkt);

Also available in: Unified diff