From fab5a8ac8d2151dce5384c6ff70d5dee25e72066 Mon Sep 17 00:00:00 2001
From: Giorgio Vazzana <[email protected]>
Date: Fri, 5 Sep 2014 17:34:51 +0200
Subject: [PATCH 3/5] lavd/v4l2: remove unneeded variable in device_init()
---
libavdevice/v4l2.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 2fd4966..a1eed1a 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -186,10 +186,8 @@ static int device_init(AVFormatContext *ctx, int *width, int *height,
uint32_t pix_fmt)
{
struct video_data *s = ctx->priv_data;
- int fd = s->fd;
struct v4l2_format fmt = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE };
struct v4l2_pix_format *pix = &fmt.fmt.pix;
-
int res = 0;
pix->width = *width;
@@ -197,7 +195,7 @@ static int device_init(AVFormatContext *ctx, int *width, int *height,
pix->pixelformat = pix_fmt;
pix->field = V4L2_FIELD_ANY;
- if (v4l2_ioctl(fd, VIDIOC_S_FMT, &fmt) < 0)
+ if (v4l2_ioctl(s->fd, VIDIOC_S_FMT, &fmt) < 0)
res = AVERROR(errno);
if ((*width != fmt.fmt.pix.width) || (*height != fmt.fmt.pix.height)) {
--
1.7.9.5
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
