Mercurial > libavformat.hg

comparison tiertexseq.c @ 2274:b21c2af60bc9 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
author takis
date Thu, 19 Jul 2007 15:23:32 +0000
parents 7eb456c4ed8a
children d52c718e83f9
comparison
equal deleted inserted replaced
2273:7eb456c4ed8a 2274:b21c2af60bc9
113 if (seq_buffer->fill_size + data_size > seq_buffer->data_size) 113 if (seq_buffer->fill_size + data_size > seq_buffer->data_size)
114 return AVERROR_INVALIDDATA; 114 return AVERROR_INVALIDDATA;
115 115
116 url_fseek(pb, seq->current_frame_offs + data_offs, SEEK_SET); 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 (get_buffer(pb, seq_buffer->data + seq_buffer->fill_size, data_size) != data_size)
118 return AVERROR_IO; 118 return AVERROR(EIO);
119 119
120 seq_buffer->fill_size += data_size; 120 seq_buffer->fill_size += data_size;
121 return 0; 121 return 0;
122 } 122 }
123 123
256 pkt->data[0] = 0; 256 pkt->data[0] = 0;
257 if (seq->current_pal_data_size != 0) { 257 if (seq->current_pal_data_size != 0) {
258 pkt->data[0] |= 1; 258 pkt->data[0] |= 1;
259 url_fseek(pb, seq->current_frame_offs + seq->current_pal_data_offs, SEEK_SET); 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 (get_buffer(pb, &pkt->data[1], seq->current_pal_data_size) != seq->current_pal_data_size)
261 return AVERROR_IO; 261 return AVERROR(EIO);
262 } 262 }
263 if (seq->current_video_data_size != 0) { 263 if (seq->current_video_data_size != 0) {
264 pkt->data[0] |= 2; 264 pkt->data[0] |= 2;
265 memcpy(&pkt->data[1 + seq->current_pal_data_size], 265 memcpy(&pkt->data[1 + seq->current_pal_data_size],
266 seq->current_video_data_ptr, 266 seq->current_video_data_ptr,
275 } 275 }
276 } 276 }
277 277
278 /* audio packet */ 278 /* audio packet */
279 if (seq->current_audio_data_offs == 0) /* end of data reached */ 279 if (seq->current_audio_data_offs == 0) /* end of data reached */
280 return AVERROR_IO; 280 return AVERROR(EIO);
281 281
282 url_fseek(pb, seq->current_frame_offs + seq->current_audio_data_offs, SEEK_SET); 282 url_fseek(pb, seq->current_frame_offs + seq->current_audio_data_offs, SEEK_SET);
283 rc = av_get_packet(pb, pkt, seq->current_audio_data_size); 283 rc = av_get_packet(pb, pkt, seq->current_audio_data_size);
284 if (rc < 0) 284 if (rc < 0)
285 return rc; 285 return rc;