[libav-commits] v4l2: Unify one instance of reading/storing errno

Martin Storsjö git at libav.org
Tue Nov 11 09:10:57 CET 2014


Module: libav
Branch: master
Commit: b776113e5d4a56759615196de98efe802e95a6b6

Author:    Martin Storsjö <martin at martin.st>
Committer: Martin Storsjö <martin at martin.st>
Date:      Mon Nov 10 09:49:01 2014 +0200

v4l2: Unify one instance of reading/storing errno

Signed-off-by: Martin Storsjö <martin at martin.st>

---

 libavdevice/v4l2.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index fdec0ec..302639d 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -348,14 +348,14 @@ static int mmap_init(AVFormatContext *ctx)
 
     res = ioctl(s->fd, VIDIOC_REQBUFS, &req);
     if (res < 0) {
-        res = errno;
-        if (errno == EINVAL) {
+        res = AVERROR(errno);
+        if (res == AVERROR(EINVAL)) {
             av_log(ctx, AV_LOG_ERROR, "Device does not support mmap\n");
         } else {
             av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_REQBUFS)\n");
         }
 
-        return AVERROR(res);
+        return res;
     }
 
     if (req.count < 2) {



More information about the libav-commits mailing list