Revision e63a3628 libavformat/tiertexseq.c

View differences:

libavformat/tiertexseq.c
86 86
    url_fseek(pb, 256, SEEK_SET);
87 87

  
88 88
    for (i = 0; i < SEQ_NUM_FRAME_BUFFERS; i++) {
89
        sz = get_le16(pb);
89
        sz = avio_rl16(pb);
90 90
        if (sz == 0)
91 91
            break;
92 92
        else {
......
114 114
        return AVERROR_INVALIDDATA;
115 115

  
116 116
    url_fseek(pb, seq->current_frame_offs + data_offs, SEEK_SET);
117
    if (get_buffer(pb, seq_buffer->data + seq_buffer->fill_size, data_size) != data_size)
117
    if (avio_read(pb, seq_buffer->data + seq_buffer->fill_size, data_size) != data_size)
118 118
        return AVERROR(EIO);
119 119

  
120 120
    seq_buffer->fill_size += data_size;
......
131 131
    url_fseek(pb, seq->current_frame_offs, SEEK_SET);
132 132

  
133 133
    /* sound data */
134
    seq->current_audio_data_offs = get_le16(pb);
134
    seq->current_audio_data_offs = avio_rl16(pb);
135 135
    if (seq->current_audio_data_offs) {
136 136
        seq->current_audio_data_size = SEQ_AUDIO_BUFFER_SIZE * 2;
137 137
    } else {
......
139 139
    }
140 140

  
141 141
    /* palette data */
142
    seq->current_pal_data_offs = get_le16(pb);
142
    seq->current_pal_data_offs = avio_rl16(pb);
143 143
    if (seq->current_pal_data_offs) {
144 144
        seq->current_pal_data_size = 768;
145 145
    } else {
......
148 148

  
149 149
    /* video data */
150 150
    for (i = 0; i < 4; i++)
151
        buffer_num[i] = get_byte(pb);
151
        buffer_num[i] = avio_r8(pb);
152 152

  
153 153
    for (i = 0; i < 4; i++)
154
        offset_table[i] = get_le16(pb);
154
        offset_table[i] = avio_rl16(pb);
155 155

  
156 156
    for (i = 0; i < 3; i++) {
157 157
        if (offset_table[i]) {
......
257 257
            if (seq->current_pal_data_size) {
258 258
                pkt->data[0] |= 1;
259 259
                url_fseek(pb, seq->current_frame_offs + seq->current_pal_data_offs, SEEK_SET);
260
                if (get_buffer(pb, &pkt->data[1], seq->current_pal_data_size) != seq->current_pal_data_size)
260
                if (avio_read(pb, &pkt->data[1], seq->current_pal_data_size) != seq->current_pal_data_size)
261 261
                    return AVERROR(EIO);
262 262
            }
263 263
            if (seq->current_video_data_size) {

Also available in: Unified diff