diff options
author | Luca Abeni <lucabe72@email.it> | 2007-11-19 07:54:04 +0000 |
---|---|---|
committer | Luca Abeni <lucabe72@email.it> | 2007-11-19 07:54:04 +0000 |
commit | 9f74582cea3fd626737cd6785f8ae1da2491fab5 (patch) | |
tree | ccae6223d8b2d5ebafadddde6b70bbcaf8bf4aca | |
parent | 7f0cd6a5293ff7608b3725f4dcc6ad141030cc4f (diff) | |
download | ffmpeg-9f74582cea3fd626737cd6785f8ae1da2491fab5.tar.gz |
Do not use perror() in audio, video, and DV grabbers
Originally committed as revision 11058 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavformat/audio.c | 8 | ||||
-rw-r--r-- | libavformat/dv1394.c | 16 | ||||
-rw-r--r-- | libavformat/v4l.c | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/libavformat/audio.c b/libavformat/audio.c index 6122b8be00..151cbffd51 100644 --- a/libavformat/audio.c +++ b/libavformat/audio.c @@ -58,7 +58,7 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device) else audio_fd = open(audio_device, O_RDONLY); if (audio_fd < 0) { - perror(audio_device); + av_log(NULL, AV_LOG_ERROR, "%s: %s\n", audio_device, strerror(errno)); return AVERROR(EIO); } @@ -114,14 +114,14 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device) } err=ioctl(audio_fd, SNDCTL_DSP_SETFMT, &tmp); if (err < 0) { - perror("SNDCTL_DSP_SETFMT"); + av_log(NULL, AV_LOG_ERROR, "SNDCTL_DSP_SETFMT: %s\n", strerror(errno)); goto fail; } tmp = (s->channels == 2); err = ioctl(audio_fd, SNDCTL_DSP_STEREO, &tmp); if (err < 0) { - perror("SNDCTL_DSP_STEREO"); + av_log(NULL, AV_LOG_ERROR, "SNDCTL_DSP_STEREO: %s\n", strerror(errno)); goto fail; } if (tmp) @@ -130,7 +130,7 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device) tmp = s->sample_rate; err = ioctl(audio_fd, SNDCTL_DSP_SPEED, &tmp); if (err < 0) { - perror("SNDCTL_DSP_SPEED"); + av_log(NULL, AV_LOG_ERROR, "SNDCTL_DSP_SPEED: %s\n", strerror(errno)); goto fail; } s->sample_rate = tmp; /* store real sample rate */ diff --git a/libavformat/dv1394.c b/libavformat/dv1394.c index 93e08ee6e2..8e2e2f607c 100644 --- a/libavformat/dv1394.c +++ b/libavformat/dv1394.c @@ -74,7 +74,7 @@ static int dv1394_start(struct dv1394_data *dv) { /* Tell DV1394 driver to enable receiver */ if (ioctl(dv->fd, DV1394_START_RECEIVE, 0) < 0) { - perror("Failed to start receiver"); + av_log(NULL, AV_LOG_ERROR, "Failed to start receiver: %s\n", strerror(errno)); return -1; } return 0; @@ -101,19 +101,19 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap /* Open and initialize DV1394 device */ dv->fd = open(context->filename, O_RDONLY); if (dv->fd < 0) { - perror("Failed to open DV interface"); + av_log(context, AV_LOG_ERROR, "Failed to open DV interface: %s\n", strerror(errno)); goto failed; } if (dv1394_reset(dv) < 0) { - perror("Failed to initialize DV interface"); + av_log(context, AV_LOG_ERROR, "Failed to initialize DV interface: %s\n", strerror(errno)); goto failed; } dv->ring = mmap(NULL, DV1394_PAL_FRAME_SIZE * DV1394_RING_FRAMES, PROT_READ, MAP_PRIVATE, dv->fd, 0); if (dv->ring == MAP_FAILED) { - perror("Failed to mmap DV ring buffer"); + av_log(context, AV_LOG_ERROR, "Failed to mmap DV ring buffer: %s\n", strerror(errno)); goto failed; } @@ -162,12 +162,12 @@ restart_poll: if (poll(&p, 1, -1) < 0) { if (errno == EAGAIN || errno == EINTR) goto restart_poll; - perror("Poll failed"); + av_log(context, AV_LOG_ERROR, "Poll failed: %s\n", strerror(errno)); return AVERROR(EIO); } if (ioctl(dv->fd, DV1394_GET_STATUS, &s) < 0) { - perror("Failed to get status"); + av_log(context, AV_LOG_ERROR, "Failed to get status: %s\n", strerror(errno)); return AVERROR(EIO); } #ifdef DV1394_DEBUG @@ -213,11 +213,11 @@ static int dv1394_close(AVFormatContext * context) /* Shutdown DV1394 receiver */ if (ioctl(dv->fd, DV1394_SHUTDOWN, 0) < 0) - perror("Failed to shutdown DV1394"); + av_log(context, AV_LOG_ERROR, "Failed to shutdown DV1394: %s\n", strerror(errno)); /* Unmap ring buffer */ if (munmap(dv->ring, DV1394_NTSC_FRAME_SIZE * DV1394_RING_FRAMES) < 0) - perror("Failed to munmap DV1394 ring buffer"); + av_log(context, AV_LOG_ERROR, "Failed to munmap DV1394 ring buffer: %s\n", strerror(errno)); close(dv->fd); av_free(dv->dv_demux); diff --git a/libavformat/v4l.c b/libavformat/v4l.c index ac3cb0eda2..8005378559 100644 --- a/libavformat/v4l.c +++ b/libavformat/v4l.c @@ -119,12 +119,12 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) video_fd = open(s1->filename, O_RDWR); if (video_fd < 0) { - perror(s1->filename); + av_log(s1, AV_LOG_ERROR, "%s: %s\n", s1->filename, strerror(errno)); goto fail; } if (ioctl(video_fd,VIDIOCGCAP, &s->video_cap) < 0) { - perror("VIDIOCGCAP"); + av_log(s1, AV_LOG_ERROR, "VIDIOCGCAP: %s\n", strerror(errno)); goto fail; } @@ -221,7 +221,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) if ((unsigned char*)-1 == s->video_buf) { s->video_buf = mmap(0,s->gb_buffers.size,PROT_READ|PROT_WRITE,MAP_PRIVATE,video_fd,0); if ((unsigned char*)-1 == s->video_buf) { - perror("mmap"); + av_log(s1, AV_LOG_ERROR, "mmap: %s\n", strerror(errno)); goto fail; } } @@ -298,7 +298,7 @@ static int v4l_mm_read_picture(VideoData *s, uint8_t *buf) if (errno == EAGAIN) av_log(NULL, AV_LOG_ERROR, "Cannot Sync\n"); else - perror("VIDIOCMCAPTURE"); + av_log(NULL, AV_LOG_ERROR, "VIDIOCMCAPTURE: %s\n", strerror(errno)); return AVERROR(EIO); } |