[FFmpeg-cvslog] r22513 - in trunk: libavdevice/alsa-audio-common.c libavdevice/vfwcap.c libavformat/ape.c libavformat/cafdec.c libavformat/flacdec.c libavformat/soxdec.c libavutil/error.h
stefano
subversion
Sat Mar 13 20:19:44 CET 2010
Author: stefano
Date: Sat Mar 13 20:19:44 2010
New Revision: 22513
Log:
Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and mark
AVERROR_EIO for deletion at the next major bump.
Modified:
trunk/libavdevice/alsa-audio-common.c
trunk/libavdevice/vfwcap.c
trunk/libavformat/ape.c
trunk/libavformat/cafdec.c
trunk/libavformat/flacdec.c
trunk/libavformat/soxdec.c
trunk/libavutil/error.h
Modified: trunk/libavdevice/alsa-audio-common.c
==============================================================================
--- trunk/libavdevice/alsa-audio-common.c Sat Mar 13 20:19:40 2010 (r22512)
+++ trunk/libavdevice/alsa-audio-common.c Sat Mar 13 20:19:44 2010 (r22513)
@@ -74,7 +74,7 @@ av_cold int ff_alsa_open(AVFormatContext
if (res < 0) {
av_log(ctx, AV_LOG_ERROR, "cannot open audio device %s (%s)\n",
audio_device, snd_strerror(res));
- return AVERROR_IO;
+ return AVERROR(EIO);
}
res = snd_pcm_hw_params_malloc(&hw_params);
@@ -153,7 +153,7 @@ fail:
snd_pcm_hw_params_free(hw_params);
fail1:
snd_pcm_close(h);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
av_cold int ff_alsa_close(AVFormatContext *s1)
@@ -175,7 +175,7 @@ int ff_alsa_xrun_recover(AVFormatContext
if (err < 0) {
av_log(s1, AV_LOG_ERROR, "cannot recover from underrun (snd_pcm_prepare failed: %s)\n", snd_strerror(err));
- return AVERROR_IO;
+ return AVERROR(EIO);
}
} else if (err == -ESTRPIPE) {
av_log(s1, AV_LOG_ERROR, "-ESTRPIPE... Unsupported!\n");
Modified: trunk/libavdevice/vfwcap.c
==============================================================================
--- trunk/libavdevice/vfwcap.c Sat Mar 13 20:19:40 2010 (r22512)
+++ trunk/libavdevice/vfwcap.c Sat Mar 13 20:19:44 2010 (r22513)
@@ -240,7 +240,7 @@ static int vfw_read_header(AVFormatConte
if(!ap->time_base.den) {
av_log(s, AV_LOG_ERROR, "A time base must be specified.\n");
- return AVERROR_IO;
+ return AVERROR(EIO);
}
ctx->s = s;
@@ -248,7 +248,7 @@ static int vfw_read_header(AVFormatConte
ctx->hwnd = capCreateCaptureWindow(NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0);
if(!ctx->hwnd) {
av_log(s, AV_LOG_ERROR, "Could not create capture window.\n");
- return AVERROR_IO;
+ return AVERROR(EIO);
}
/* If atoi fails, devnum==0 and the default device is used */
@@ -390,7 +390,7 @@ fail_bi:
fail_io:
vfw_read_close(s);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
static int vfw_read_packet(AVFormatContext *s, AVPacket *pkt)
Modified: trunk/libavformat/ape.c
==============================================================================
--- trunk/libavformat/ape.c Sat Mar 13 20:19:40 2010 (r22512)
+++ trunk/libavformat/ape.c Sat Mar 13 20:19:44 2010 (r22513)
@@ -338,9 +338,9 @@ static int ape_read_packet(AVFormatConte
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);
Modified: trunk/libavformat/cafdec.c
==============================================================================
--- trunk/libavformat/cafdec.c Sat Mar 13 20:19:40 2010 (r22512)
+++ trunk/libavformat/cafdec.c Sat Mar 13 20:19:44 2010 (r22513)
@@ -293,13 +293,13 @@ static int read_packet(AVFormatContext *
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 *
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)
Modified: trunk/libavformat/flacdec.c
==============================================================================
--- trunk/libavformat/flacdec.c Sat Mar 13 20:19:40 2010 (r22512)
+++ trunk/libavformat/flacdec.c Sat Mar 13 20:19:44 2010 (r22513)
@@ -70,7 +70,7 @@ static int flac_read_header(AVFormatCont
}
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 */
Modified: trunk/libavformat/soxdec.c
==============================================================================
--- trunk/libavformat/soxdec.c Sat Mar 13 20:19:40 2010 (r22512)
+++ trunk/libavformat/soxdec.c Sat Mar 13 20:19:44 2010 (r22513)
@@ -97,7 +97,7 @@ static int sox_read_header(AVFormatConte
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;
Modified: trunk/libavutil/error.h
==============================================================================
--- trunk/libavutil/error.h Sat Mar 13 20:19:40 2010 (r22512)
+++ trunk/libavutil/error.h Sat Mar 13 20:19:44 2010 (r22513)
@@ -36,9 +36,9 @@
#if LIBAVUTIL_VERSION_MAJOR < 51
#define AVERROR_UNKNOWN AVERROR(EINVAL) /**< unknown error */
+#define AVERROR_IO AVERROR(EIO) /**< I/O error */
#endif
-#define AVERROR_IO AVERROR(EIO) /**< I/O error */
#define AVERROR_NUMEXPECTED AVERROR(EDOM) /**< Number syntax expected in filename. */
#define AVERROR_INVALIDDATA AVERROR(EINVAL) /**< invalid data found */
#define AVERROR_NOMEM AVERROR(ENOMEM) /**< not enough memory */
More information about the ffmpeg-cvslog
mailing list