aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-03-13 19:19:44 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-03-13 19:19:44 +0000
commit5ae092ee34bd8a174306abdd5cd8bf6eea4a2f8e (patch)
tree3934504fcfafd53f9c045fc0cf5b710bb8ee63f9 /libavformat
parent0edfa79b23163be51d3ee1678f5ff87b5207f636 (diff)
downloadffmpeg-5ae092ee34bd8a174306abdd5cd8bf6eea4a2f8e.tar.gz
Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and mark
AVERROR_EIO for deletion at the next major bump. Originally committed as revision 22513 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/ape.c4
-rw-r--r--libavformat/cafdec.c8
-rw-r--r--libavformat/flacdec.c2
-rw-r--r--libavformat/soxdec.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/ape.c b/libavformat/ape.c
index a881138431..b5f93cf134 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -338,9 +338,9 @@ static int ape_read_packet(AVFormatContext * s, AVPacket * pkt)
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);
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index c4aad1bbfa..df297164ba 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -293,13 +293,13 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
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 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
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)
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index 495fa2b4a0..e8c9c87ad8 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -70,7 +70,7 @@ static int flac_read_header(AVFormatContext *s,
}
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 */
diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c
index ceaedec293..0151efebc1 100644
--- a/libavformat/soxdec.c
+++ b/libavformat/soxdec.c
@@ -97,7 +97,7 @@ static int sox_read_header(AVFormatContext *s,
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;