Replace all occurrences of AVERROR_IO with AVERROR(EIO).

Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk

cmdutils.c

@@ -133,7 +133,7 @@ void print_error(const char *filename, int err)
     case AVERROR_NOFMT:
         fprintf(stderr, "%s: Unknown format\n", filename);
         break;
-    case AVERROR_IO:
+    case AVERROR(EIO):
         fprintf(stderr, "%s: I/O error occured\n"
                 "Usually that means that input file is truncated and/or corrupted.\n",
                 filename);

libavformat/4xm.c

@@ -118,7 +118,7 @@ static int fourxm_read_header(AVFormatContext *s,
     if (!header)
         return AVERROR(ENOMEM);
     if (get_buffer(pb, header, header_size) != header_size)
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     /* take the lazy approach and search for any and all vtrk and strk chunks */
     for (i = 0; i < header_size - 8; i++) {
@@ -235,7 +235,7 @@ static int fourxm_read_packet(AVFormatContext *s,
         fourcc_tag = AV_RL32(&header[0]);
         size = AV_RL32(&header[4]);
         if (url_feof(pb))
-            return AVERROR_IO;
+            return AVERROR(EIO);
         switch (fourcc_tag) {
 
         case LIST_TAG:
@@ -253,7 +253,7 @@ static int fourxm_read_packet(AVFormatContext *s,
             /* allocate 8 more bytes than 'size' to account for fourcc
              * and size */
             if (size + 8 < size || av_new_packet(pkt, size + 8))
-                return AVERROR_IO;
+                return AVERROR(EIO);
             pkt->stream_index = fourxm->video_stream_index;
             pkt->pts = fourxm->video_pts;
             pkt->pos = url_ftell(&s->pb);
@@ -275,7 +275,7 @@ static int fourxm_read_packet(AVFormatContext *s,
             if (track_number == fourxm->selected_track) {
                 ret= av_get_packet(&s->pb, pkt, size);
                 if(ret<0)
-                    return AVERROR_IO;
+                    return AVERROR(EIO);
                 pkt->stream_index =
                     fourxm->tracks[fourxm->selected_track].stream_index;
                 pkt->pts = fourxm->audio_pts;

libavformat/aiff.c

@@ -64,7 +64,7 @@ static int get_tag(ByteIOContext *pb, uint32_t * tag)
     int size;
 
     if (url_feof(pb))
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     *tag = get_le32(pb);
     size = get_be32(pb);
@@ -400,7 +400,7 @@ static int aiff_read_packet(AVFormatContext *s,
 
     /* End of stream may be reached */
     if (url_feof(&s->pb))
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     /* Now for that packet */
     res = av_get_packet(&s->pb, pkt, (MAX_SIZE / st->codec->block_align) * st->codec->block_align);

libavformat/amr.c

@@ -122,7 +122,7 @@ static int amr_read_packet(AVFormatContext *s,
 
     if (url_feof(&s->pb))
     {
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
 //FIXME this is wrong, this should rather be in a AVParset
@@ -148,7 +148,7 @@ static int amr_read_packet(AVFormatContext *s,
 
     if ( (size==0) || av_new_packet(pkt, size))
     {
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
     pkt->stream_index = 0;
@@ -160,7 +160,7 @@ static int amr_read_packet(AVFormatContext *s,
     if (read != size-1)
     {
         av_free_packet(pkt);
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
     return 0;

libavformat/apc.c

@@ -75,7 +75,7 @@ static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap)
 static int apc_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     if (av_get_packet(&s->pb, pkt, MAX_READ_SIZE) <= 0)
-        return AVERROR_IO;
+        return AVERROR(EIO);
     pkt->stream_index = 0;
     return 0;
 }

libavformat/asf.c

@@ -714,7 +714,7 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
     //static int pc = 0;
     for (;;) {
         if(url_feof(pb))
-            return AVERROR_IO;
+            return AVERROR(EIO);
         if (asf->packet_size_left < FRAME_HEADER_SIZE
             || asf->packet_segments < 1) {
             //asf->packet_size_left <= asf->packet_padsize) {
@@ -727,7 +727,7 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
             asf->packet_pos= url_ftell(&s->pb);
             if (asf->data_object_size != (uint64_t)-1 &&
                 (asf->packet_pos - asf->data_object_offset >= asf->data_object_size))
-                return AVERROR_IO; /* Do not exceed the size of the data object */
+                return AVERROR(EIO); /* Do not exceed the size of the data object */
             ret = asf_get_packet(s);
             //printf("READ ASF PACKET  %d   r:%d   c:%d\n", ret, asf->packet_size_left, pc++);
             if (ret < 0)

libavformat/au.c

@@ -159,10 +159,10 @@ static int au_read_packet(AVFormatContext *s,
     int ret;
 
     if (url_feof(&s->pb))
-        return AVERROR_IO;
+        return AVERROR(EIO);
     ret= av_get_packet(&s->pb, pkt, MAX_SIZE);
     if (ret < 0)
-        return AVERROR_IO;
+        return AVERROR(EIO);
     pkt->stream_index = 0;
 
     /* note: we need to modify the packet size here to handle the last

libavformat/audio.c

@@ -59,7 +59,7 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
         audio_fd = open(audio_device, O_RDONLY);
     if (audio_fd < 0) {
         perror(audio_device);
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
     if (flip && *flip == '1') {
@@ -110,7 +110,7 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
     default:
         av_log(NULL, AV_LOG_ERROR, "Soundcard does not support 16 bit sample format\n");
         close(audio_fd);
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
     err=ioctl(audio_fd, SNDCTL_DSP_SETFMT, &tmp);
     if (err < 0) {
@@ -139,7 +139,7 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
     return 0;
  fail:
     close(audio_fd);
-    return AVERROR_IO;
+    return AVERROR(EIO);
 }
 
 static int audio_close(AudioData *s)
@@ -160,7 +160,7 @@ static int audio_write_header(AVFormatContext *s1)
     s->channels = st->codec->channels;
     ret = audio_open(s, 1, s1->filename);
     if (ret < 0) {
-        return AVERROR_IO;
+        return AVERROR(EIO);
     } else {
         return 0;
     }
@@ -185,7 +185,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
                 if (ret > 0)
                     break;
                 if (ret < 0 && (errno != EAGAIN && errno != EINTR))
-                    return AVERROR_IO;
+                    return AVERROR(EIO);
             }
             s->buffer_ptr = 0;
         }
@@ -224,7 +224,7 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
     ret = audio_open(s, 0, s1->filename);
     if (ret < 0) {
         av_free(st);
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
     /* take real parameters */
@@ -245,7 +245,7 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
     struct audio_buf_info abufi;
 
     if (av_new_packet(pkt, s->frame_size) < 0)
-        return AVERROR_IO;
+        return AVERROR(EIO);
     for(;;) {
         struct timeval tv;
         fd_set fds;
@@ -270,7 +270,7 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
         }
         if (!(ret == 0 || (ret == -1 && (errno == EAGAIN || errno == EINTR)))) {
             av_free_packet(pkt);
-            return AVERROR_IO;
+            return AVERROR(EIO);
         }
     }
     pkt->size = ret;

libavformat/avio.c

@@ -101,7 +101,7 @@ int url_read(URLContext *h, unsigned char *buf, int size)
 {
     int ret;
     if (h->flags & URL_WRONLY)
-        return AVERROR_IO;
+        return AVERROR(EIO);
     ret = h->prot->url_read(h, buf, size);
     return ret;
 }
@@ -111,10 +111,10 @@ int url_write(URLContext *h, unsigned char *buf, int size)
 {
     int ret;
     if (!(h->flags & (URL_WRONLY | URL_RDWR)))
-        return AVERROR_IO;
+        return AVERROR(EIO);
     /* avoid sending too big packets */
     if (h->max_packet_size && size > h->max_packet_size)
-        return AVERROR_IO;
+        return AVERROR(EIO);
     ret = h->prot->url_write(h, buf, size);
     return ret;
 }

libavformat/aviobuf.c

@@ -514,7 +514,7 @@ int url_fdopen(ByteIOContext *s, URLContext *h)
                       (h->flags & URL_WRONLY || h->flags & URL_RDWR), h,
                       url_read_packet, url_write_packet, url_seek_packet) < 0) {
         av_free(buffer);
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
     s->is_streamed = h->is_streamed;
     s->max_packet_size = max_packet_size;

libavformat/avisynth.c

@@ -156,10 +156,10 @@ static int avisynth_read_packet(AVFormatContext *s, AVPacket *pkt)
   stream = &avs->streams[stream_id];
 
   if (stream->read >= stream->info.dwLength)
-    return AVERROR_IO;
+    return AVERROR(EIO);
 
   if (av_new_packet(pkt, stream->chunck_size))
-    return AVERROR_IO;
+    return AVERROR(EIO);
   pkt->stream_index = stream_id;
   pkt->pts = avs->streams[stream_id].read / avs->streams[stream_id].chunck_samples;
 

libavformat/avs.c

@@ -106,7 +106,7 @@ avs_read_video_packet(AVFormatContext * s, AVPacket * pkt,
     ret = get_buffer(&s->pb, pkt->data + palette_size + 4, size - 4) + 4;
     if (ret < size) {
         av_free_packet(pkt);
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
     pkt->size = ret + palette_size;
@@ -127,7 +127,7 @@ static int avs_read_audio_packet(AVFormatContext * s, AVPacket * pkt)
     size = url_ftell(&s->pb) - size;
     avs->remaining_audio_size -= size;
 
-    if (ret == AVERROR_IO)
+    if (ret == AVERROR(EIO))
         return 0;    /* this indicate EOS */
     if (ret < 0)
         return ret;
@@ -154,7 +154,7 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
     while (1) {
         if (avs->remaining_frame_size <= 0) {
             if (!get_le16(&s->pb))    /* found EOF */
-                return AVERROR_IO;
+                return AVERROR(EIO);
             avs->remaining_frame_size = get_le16(&s->pb) - 4;
         }
 
@@ -168,7 +168,7 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
             case AVS_PALETTE:
                 ret = get_buffer(&s->pb, palette, size - 4);
                 if (ret < size - 4)
-                    return AVERROR_IO;
+                    return AVERROR(EIO);
                 palette_size = size;
                 break;
 

libavformat/bethsoftvid.c

@@ -179,7 +179,7 @@ static int vid_read_packet(AVFormatContext *s,
     int ret_value;
 
     if(vid->is_finished || url_feof(pb))
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     block_type = get_byte(pb);
     switch(block_type){
@@ -188,7 +188,7 @@ static int vid_read_packet(AVFormatContext *s,
             ret_value = av_get_packet(pb, pkt, 3 * 256 + 1);
             if(ret_value != 3 * 256 + 1){
                 av_free_packet(pkt);
-                return AVERROR_IO;
+                return AVERROR(EIO);
             }
             pkt->stream_index = 0;
             return ret_value;
@@ -202,7 +202,7 @@ static int vid_read_packet(AVFormatContext *s,
             audio_length = get_le16(pb);
             ret_value = av_get_packet(pb, pkt, audio_length);
             pkt->stream_index = 1;
-            return (ret_value != audio_length ? AVERROR_IO : ret_value);
+            return (ret_value != audio_length ? AVERROR(EIO) : ret_value);
 
         case VIDEO_P_FRAME:
         case VIDEO_YOFF_P_FRAME:
@@ -214,7 +214,7 @@ static int vid_read_packet(AVFormatContext *s,
             if(vid->nframes != 0)
                 av_log(s, AV_LOG_VERBOSE, "reached terminating character but not all frames read.\n");
             vid->is_finished = 1;
-            return AVERROR_IO;
+            return AVERROR(EIO);
         default:
             av_log(s, AV_LOG_ERROR, "unknown block (character = %c, decimal = %d, hex = %x)!!!\n",
                    block_type, block_type, block_type); return -1;

libavformat/c93.c

@@ -129,7 +129,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
     }
     if (c93->current_frame >= br->frames) {
         if (c93->current_block >= 511 || !br[1].length)
-            return AVERROR_IO;
+            return AVERROR(EIO);
         br++;
         c93->current_block++;
         c93->current_frame = 0;
@@ -154,7 +154,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
 
     ret = get_buffer(pb, pkt->data + 1, datasize);
     if (ret < datasize) {
-        ret = AVERROR_IO;
+        ret = AVERROR(EIO);
         goto fail;
     }
 
@@ -168,7 +168,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
         pkt->data[0] |= C93_HAS_PALETTE;
         ret = get_buffer(pb, pkt->data + pkt->size, datasize);
         if (ret < datasize) {
-            ret = AVERROR_IO;
+            ret = AVERROR(EIO);
             goto fail;
         }
         pkt->size += 768;

libavformat/daud.c

@@ -37,7 +37,7 @@ static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
     ByteIOContext *pb = &s->pb;
     int ret, size;
     if (url_feof(pb))
-        return AVERROR_IO;
+        return AVERROR(EIO);
     size = get_be16(pb);
     get_be16(pb); // unknown
     ret = av_get_packet(pb, pkt, size);

libavformat/dsicin.c

@@ -147,7 +147,7 @@ static int cin_read_frame_header(CinDemuxContext *cin, ByteIOContext *pb) {
     hdr->audio_frame_size = get_le32(pb);
 
     if (url_feof(pb) || url_ferror(pb))
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     if (get_le32(pb) != 0xAA55AA55)
         return AVERROR_INVALIDDATA;
@@ -189,7 +189,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
         pkt->data[3] = hdr->video_frame_type;
 
         if (get_buffer(pb, &pkt->data[4], pkt_size) != pkt_size)
-            return AVERROR_IO;
+            return AVERROR(EIO);
 
         /* sound buffer will be processed on next read_packet() call */
         cin->audio_buffer_size = hdr->audio_frame_size;
@@ -205,7 +205,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
     cin->audio_stream_pts += cin->audio_buffer_size * 2 / cin->file_header.audio_frame_size;
 
     if (get_buffer(pb, pkt->data, cin->audio_buffer_size) != cin->audio_buffer_size)
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     cin->audio_buffer_size = 0;
     return 0;

libavformat/dv.c

@@ -388,7 +388,7 @@ static int dv_read_header(AVFormatContext *s,
 
     if (get_buffer(&s->pb, c->buf, DV_PROFILE_BYTES) <= 0 ||
         url_fseek(&s->pb, -DV_PROFILE_BYTES, SEEK_CUR) < 0)
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     c->dv_demux->sys = dv_frame_profile(c->buf);
     s->bit_rate = av_rescale(c->dv_demux->sys->frame_size * 8,
@@ -409,7 +409,7 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)
     if (size < 0) {
         size = c->dv_demux->sys->frame_size;
         if (get_buffer(&s->pb, c->buf, size) <= 0)
-            return AVERROR_IO;
+            return AVERROR(EIO);
 
         size = dv_produce_packet(c->dv_demux, pkt, c->buf, size);
     }

libavformat/dv1394.c

@@ -124,7 +124,7 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap
 
 failed:
     close(dv->fd);
-    return AVERROR_IO;
+    return AVERROR(EIO);
 }
 
 static int dv1394_read_packet(AVFormatContext *context, AVPacket *pkt)
@@ -163,12 +163,12 @@ restart_poll:
             if (errno == EAGAIN || errno == EINTR)
                 goto restart_poll;
             perror("Poll failed");
-            return AVERROR_IO;
+            return AVERROR(EIO);
         }
 
         if (ioctl(dv->fd, DV1394_GET_STATUS, &s) < 0) {
             perror("Failed to get status");
-            return AVERROR_IO;
+            return AVERROR(EIO);
         }
 #ifdef DV1394_DEBUG
         av_log(context, AV_LOG_DEBUG, "DV1394: status\n"

libavformat/dxa.c

@@ -149,7 +149,7 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt)
         ret = av_get_packet(&s->pb, pkt, size);
         pkt->stream_index = 1;
         if(ret != size)
-            return AVERROR_IO;
+            return AVERROR(EIO);
         c->bytes_left -= size;
         c->wavpos = url_ftell(&s->pb);
         return 0;
@@ -186,7 +186,7 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt)
             ret = get_buffer(&s->pb, pkt->data + DXA_EXTRA_SIZE + pal_size, size);
             if(ret != size){
                 av_free_packet(pkt);
-                return AVERROR_IO;
+                return AVERROR(EIO);
             }
             if(pal_size) memcpy(pkt->data, pal, pal_size);
             pkt->stream_index = 0;

libavformat/electronicarts.c

@@ -178,7 +178,7 @@ static int ea_read_header(AVFormatContext *s,
     AVStream *st;
 
     if (!process_ea_header(s))
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
 #if 0
     /* initialize the video decoder stream */
@@ -226,7 +226,7 @@ static int ea_read_packet(AVFormatContext *s,
     while (!packet_read) {
 
         if (get_buffer(pb, preamble, EA_PREAMBLE_SIZE) != EA_PREAMBLE_SIZE)
-            return AVERROR_IO;
+            return AVERROR(EIO);
         chunk_type = AV_RL32(&preamble[0]);
         chunk_size = AV_RL32(&preamble[4]) - EA_PREAMBLE_SIZE;
 
@@ -235,7 +235,7 @@ static int ea_read_packet(AVFormatContext *s,
         case SCDl_TAG:
             ret = av_get_packet(pb, pkt, chunk_size);
             if (ret != chunk_size)
-                ret = AVERROR_IO;
+                ret = AVERROR(EIO);
             else {
                     pkt->stream_index = ea->audio_stream_index;
                     pkt->pts = 90000;
@@ -253,7 +253,7 @@ static int ea_read_packet(AVFormatContext *s,
 
         /* ending tag */
         case SCEl_TAG:
-            ret = AVERROR_IO;
+            ret = AVERROR(EIO);
             packet_read = 1;
             break;