Revision e356fc57 libavformat/iff.c

View differences:

libavformat/iff.c
134 134
        return AVERROR(ENOMEM);
135 135

  
136 136
    st->codec->channels = 1;
137
    url_fskip(pb, 8);
137
    avio_seek(pb, 8, SEEK_CUR);
138 138
    // codec_tag used by ByteRun1 decoder to distinguish progressive (PBM) and interlaced (ILBM) content
139 139
    st->codec->codec_tag = avio_rl32(pb);
140 140

  
......
152 152

  
153 153
            if (data_size < 14)
154 154
                return AVERROR_INVALIDDATA;
155
            url_fskip(pb, 12);
155
            avio_seek(pb, 12, SEEK_CUR);
156 156
            st->codec->sample_rate = avio_rb16(pb);
157 157
            if (data_size >= 16) {
158
                url_fskip(pb, 1);
158
                avio_seek(pb, 1, SEEK_CUR);
159 159
                compression        = avio_r8(pb);
160 160
            }
161 161
            break;
......
186 186
                return AVERROR_INVALIDDATA;
187 187
            st->codec->width                 = avio_rb16(pb);
188 188
            st->codec->height                = avio_rb16(pb);
189
            url_fskip(pb, 4); // x, y offset
189
            avio_seek(pb, 4, SEEK_CUR); // x, y offset
190 190
            st->codec->bits_per_coded_sample = avio_r8(pb);
191 191
            if (data_size >= 11) {
192
                url_fskip(pb, 1); // masking
192
                avio_seek(pb, 1, SEEK_CUR); // masking
193 193
                compression                  = avio_r8(pb);
194 194
            }
195 195
            if (data_size >= 16) {
196
                url_fskip(pb, 3); // paddding, transparent
196
                avio_seek(pb, 3, SEEK_CUR); // paddding, transparent
197 197
                st->sample_aspect_ratio.num  = avio_r8(pb);
198 198
                st->sample_aspect_ratio.den  = avio_r8(pb);
199 199
            }
......
223 223
                return res;
224 224
            }
225 225
        }
226
        url_fskip(pb, data_size - (url_ftell(pb) - orig_pos) + (data_size & 1));
226
        avio_seek(pb, data_size - (url_ftell(pb) - orig_pos) + (data_size & 1), SEEK_CUR);
227 227
    }
228 228

  
229 229
    avio_seek(pb, iff->body_pos, SEEK_SET);

Also available in: Unified diff