diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-13 19:19:44 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-13 19:19:44 +0000 |
| commit | 5ae092ee34bd8a174306abdd5cd8bf6eea4a2f8e (patch) | |
| tree | 3934504fcfafd53f9c045fc0cf5b710bb8ee63f9 /libavdevice | |
| parent | 0edfa79b23163be51d3ee1678f5ff87b5207f636 (diff) | |
| download | ffmpeg-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 'libavdevice')
| -rw-r--r-- | libavdevice/alsa-audio-common.c | 6 | ||||
| -rw-r--r-- | libavdevice/vfwcap.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c index e125b2d386..5bd0b49581 100644 --- a/libavdevice/alsa-audio-common.c +++ b/libavdevice/alsa-audio-common.c @@ -74,7 +74,7 @@ av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode, 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 *s1, int err) 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"); diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 91714571cd..3aaa5db524 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -240,7 +240,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap) 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(AVFormatContext *s, AVFormatParameters *ap) 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) |