Mercurial > libavformat.hg
comparison rm.c @ 482:0fdc96c2f2fe libavformat
sweeping change from -EIO -> AVERROR_IO
| author | melanson |
|---|---|
| date | Sat, 19 Jun 2004 03:59:34 +0000 |
| parents | 334e08488ad1 |
| children | 45abb3409125 |
comparison
equal
deleted
inserted
replaced
| 481:f1430abbbd8b | 482:0fdc96c2f2fe |
|---|---|
| 561 tag = get_le32(pb); | 561 tag = get_le32(pb); |
| 562 if (tag == MKTAG('.', 'r', 'a', 0xfd)) { | 562 if (tag == MKTAG('.', 'r', 'a', 0xfd)) { |
| 563 /* very old .ra format */ | 563 /* very old .ra format */ |
| 564 return rm_read_header_old(s, ap); | 564 return rm_read_header_old(s, ap); |
| 565 } else if (tag != MKTAG('.', 'R', 'M', 'F')) { | 565 } else if (tag != MKTAG('.', 'R', 'M', 'F')) { |
| 566 return -EIO; | 566 return AVERROR_IO; |
| 567 } | 567 } |
| 568 | 568 |
| 569 get_be32(pb); /* header size */ | 569 get_be32(pb); /* header size */ |
| 570 get_be16(pb); | 570 get_be16(pb); |
| 571 get_be32(pb); | 571 get_be32(pb); |
| 686 | 686 |
| 687 fail: | 687 fail: |
| 688 for(i=0;i<s->nb_streams;i++) { | 688 for(i=0;i<s->nb_streams;i++) { |
| 689 av_free(s->streams[i]); | 689 av_free(s->streams[i]); |
| 690 } | 690 } |
| 691 return -EIO; | 691 return AVERROR_IO; |
| 692 } | 692 } |
| 693 | 693 |
| 694 static int get_num(ByteIOContext *pb, int *len) | 694 static int get_num(ByteIOContext *pb, int *len) |
| 695 { | 695 { |
| 696 int n, n1; | 696 int n, n1; |
| 724 av_new_packet(pkt, len); | 724 av_new_packet(pkt, len); |
| 725 pkt->stream_index = 0; | 725 pkt->stream_index = 0; |
| 726 len = get_buffer(pb, pkt->data, len); | 726 len = get_buffer(pb, pkt->data, len); |
| 727 if (len <= 0) { | 727 if (len <= 0) { |
| 728 av_free_packet(pkt); | 728 av_free_packet(pkt); |
| 729 return -EIO; | 729 return AVERROR_IO; |
| 730 } | 730 } |
| 731 pkt->size = len; | 731 pkt->size = len; |
| 732 st = s->streams[0]; | 732 st = s->streams[0]; |
| 733 } else { | 733 } else { |
| 734 redo: | 734 redo: |
| 735 if (rm->nb_packets == 0) | 735 if (rm->nb_packets == 0) |
| 736 return -EIO; | 736 return AVERROR_IO; |
| 737 get_be16(pb); | 737 get_be16(pb); |
| 738 len = get_be16(pb); | 738 len = get_be16(pb); |
| 739 if (len < 12) | 739 if (len < 12) |
| 740 return -EIO; | 740 return AVERROR_IO; |
| 741 num = get_be16(pb); | 741 num = get_be16(pb); |
| 742 timestamp = get_be32(pb); | 742 timestamp = get_be32(pb); |
| 743 get_byte(pb); /* reserved */ | 743 get_byte(pb); /* reserved */ |
| 744 flags = get_byte(pb); /* flags */ | 744 flags = get_byte(pb); /* flags */ |
| 745 rm->nb_packets--; | 745 rm->nb_packets--; |