diff options
| author | Himangi Saraogi <himangi774@gmail.com> | 2015-02-10 19:36:51 +0530 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2015-02-15 13:42:31 -0800 |
| commit | 81ef46020fa654720e3beb4f5551ba634fae262a (patch) | |
| tree | bbc6cee56f734638f7166a397ea68d30b9e13e78 | |
| parent | 3a651f599a18b023602370b67a77eb0efa309b20 (diff) | |
| download | ffmpeg-81ef46020fa654720e3beb4f5551ba634fae262a.tar.gz | |
bktr: Use av_strerror and propagate error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -rw-r--r-- | libavdevice/bktr.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index 695e13f088..8042c38011 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -105,6 +105,8 @@ static av_cold int bktr_init(const char *video_device, int width, int height, char *arg; int c; struct sigaction act = { 0 }, old; + int ret; + char errbuf[128]; if (idev < 0 || idev > 4) { @@ -143,8 +145,10 @@ static av_cold int bktr_init(const char *video_device, int width, int height, *video_fd = avpriv_open(video_device, O_RDONLY); if (*video_fd < 0) { - av_log(NULL, AV_LOG_ERROR, "%s: %s\n", video_device, strerror(errno)); - return -1; + ret = AVERROR(errno); + av_strerror(ret, errbuf, sizeof(errbuf)); + av_log(NULL, AV_LOG_ERROR, "%s: %s\n", video_device, errbuf); + return ret; } geo.rows = height; @@ -166,19 +170,25 @@ static av_cold int bktr_init(const char *video_device, int width, int height, geo.oformat |= METEOR_GEO_EVEN_ONLY; if (ioctl(*video_fd, METEORSETGEO, &geo) < 0) { - av_log(NULL, AV_LOG_ERROR, "METEORSETGEO: %s\n", strerror(errno)); - return -1; + ret = AVERROR(errno); + av_strerror(ret, errbuf, sizeof(errbuf)); + av_log(NULL, AV_LOG_ERROR, "METEORSETGEO: %s\n", errbuf); + return ret; } if (ioctl(*video_fd, BT848SFMT, &c) < 0) { - av_log(NULL, AV_LOG_ERROR, "BT848SFMT: %s\n", strerror(errno)); - return -1; + ret = AVERROR(errno); + av_strerror(ret, errbuf, sizeof(errbuf)); + av_log(NULL, AV_LOG_ERROR, "BT848SFMT: %s\n", errbuf); + return ret; } c = bktr_dev[idev]; if (ioctl(*video_fd, METEORSINPUT, &c) < 0) { - av_log(NULL, AV_LOG_ERROR, "METEORSINPUT: %s\n", strerror(errno)); - return -1; + ret = AVERROR(errno); + av_strerror(ret, errbuf, sizeof(errbuf)); + av_log(NULL, AV_LOG_ERROR, "METEORSINPUT: %s\n", errbuf); + return ret; } video_buf_size = width * height * 12 / 8; @@ -186,8 +196,10 @@ static av_cold int bktr_init(const char *video_device, int width, int height, video_buf = (uint8_t *)mmap((caddr_t)0, video_buf_size, PROT_READ, MAP_SHARED, *video_fd, (off_t)0); if (video_buf == MAP_FAILED) { - av_log(NULL, AV_LOG_ERROR, "mmap: %s\n", strerror(errno)); - return -1; + ret = AVERROR(errno); + av_strerror(ret, errbuf, sizeof(errbuf)); + av_log(NULL, AV_LOG_ERROR, "mmap: %s\n", errbuf); + return ret; } if (frequency != 0.0) { |