ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Mon Nov 10 09:49:01 2014 +0200| [b776113e5d4a56759615196de98efe802e95a6b6] | committer: Martin Storsjö
v4l2: Unify one instance of reading/storing errno Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b776113e5d4a56759615196de98efe802e95a6b6 --- 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) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog