Mercurial > libavformat.hg

comparison asf.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 a5f318cc9245
children a36b77f40ee2
comparison
equal deleted inserted replaced
2273:7eb456c4ed8a 2274:b21c2af60bc9
712 ASFStream *asf_st = 0; 712 ASFStream *asf_st = 0;
713 ByteIOContext *pb = &s->pb; 713 ByteIOContext *pb = &s->pb;
714 //static int pc = 0; 714 //static int pc = 0;
715 for (;;) { 715 for (;;) {
716 if(url_feof(pb)) 716 if(url_feof(pb))
717 return AVERROR_IO; 717 return AVERROR(EIO);
718 if (asf->packet_size_left < FRAME_HEADER_SIZE 718 if (asf->packet_size_left < FRAME_HEADER_SIZE
719 || asf->packet_segments < 1) { 719 || asf->packet_segments < 1) {
720 //asf->packet_size_left <= asf->packet_padsize) { 720 //asf->packet_size_left <= asf->packet_padsize) {
721 int ret = asf->packet_size_left + asf->packet_padsize; 721 int ret = asf->packet_size_left + asf->packet_padsize;
722 //printf("PacketLeftSize:%d Pad:%d Pos:%"PRId64"\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb)); 722 //printf("PacketLeftSize:%d Pad:%d Pos:%"PRId64"\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb));
725 url_fskip(pb, ret); 725 url_fskip(pb, ret);
726 726
727 asf->packet_pos= url_ftell(&s->pb); 727 asf->packet_pos= url_ftell(&s->pb);
728 if (asf->data_object_size != (uint64_t)-1 && 728 if (asf->data_object_size != (uint64_t)-1 &&
729 (asf->packet_pos - asf->data_object_offset >= asf->data_object_size)) 729 (asf->packet_pos - asf->data_object_offset >= asf->data_object_size))
730 return AVERROR_IO; /* Do not exceed the size of the data object */ 730 return AVERROR(EIO); /* Do not exceed the size of the data object */
731 ret = asf_get_packet(s); 731 ret = asf_get_packet(s);
732 //printf("READ ASF PACKET %d r:%d c:%d\n", ret, asf->packet_size_left, pc++); 732 //printf("READ ASF PACKET %d r:%d c:%d\n", ret, asf->packet_size_left, pc++);
733 if (ret < 0) 733 if (ret < 0)
734 assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1); 734 assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1);
735 asf->packet_time_start = 0; 735 asf->packet_time_start = 0;