Mercurial > libavformat.hg
changeset 5834:134741dc8327 libavformat
Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and mark
AVERROR_EIO for deletion at the next major bump.
| author | stefano |
|---|---|
| date | Sat, 13 Mar 2010 19:19:44 +0000 |
| parents | c4d0166d9128 |
| children | a92c2f3c87e8 |
| files | ape.c cafdec.c flacdec.c soxdec.c |
| diffstat | 4 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ape.c Sat Mar 13 05:55:57 2010 +0000 +++ b/ape.c Sat Mar 13 19:19:44 2010 +0000 @@ -338,9 +338,9 @@ uint32_t extra_size = 8; if (url_feof(s->pb)) - return AVERROR_IO; + return AVERROR(EIO); if (ape->currentframe > ape->totalframes) - return AVERROR_IO; + return AVERROR(EIO); url_fseek (s->pb, ape->frames[ape->currentframe].pos, SEEK_SET);
--- a/cafdec.c Sat Mar 13 05:55:57 2010 +0000 +++ b/cafdec.c Sat Mar 13 19:19:44 2010 +0000 @@ -293,13 +293,13 @@ int64_t left = CAF_MAX_PKT_SIZE; if (url_feof(pb)) - return AVERROR_IO; + return AVERROR(EIO); /* don't read past end of data chunk */ if (caf->data_size > 0) { left = (caf->data_start + caf->data_size) - url_ftell(pb); if (left <= 0) - return AVERROR_IO; + return AVERROR(EIO); } pkt_frames = caf->frames_per_packet; @@ -317,12 +317,12 @@ pkt_size = caf->num_bytes - st->index_entries[caf->packet_cnt].pos; pkt_frames = st->duration - st->index_entries[caf->packet_cnt].timestamp; } else { - return AVERROR_IO; + return AVERROR(EIO); } } if (pkt_size == 0 || pkt_frames == 0 || pkt_size > left) - return AVERROR_IO; + return AVERROR(EIO); res = av_get_packet(pb, pkt, pkt_size); if (res < 0)
--- a/flacdec.c Sat Mar 13 05:55:57 2010 +0000 +++ b/flacdec.c Sat Mar 13 19:19:44 2010 +0000 @@ -70,7 +70,7 @@ } if (get_buffer(s->pb, buffer, metadata_size) != metadata_size) { av_freep(&buffer); - return AVERROR_IO; + return AVERROR(EIO); } break; /* skip metadata block for unsupported types */
--- a/soxdec.c Sat Mar 13 05:55:57 2010 +0000 +++ b/soxdec.c Sat Mar 13 19:19:44 2010 +0000 @@ -97,7 +97,7 @@ char *comment = av_malloc(comment_size+1); if (get_buffer(pb, comment, comment_size) != comment_size) { av_freep(&comment); - return AVERROR_IO; + return AVERROR(EIO); } comment[comment_size] = 0;