summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiorgio Vazzana <mywing81@gmail.com>2014-09-05 17:34:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-05 18:43:28 +0200
commit55cf7d9713dc839da47b56a19c97dc1b943d7d72 (patch)
treeec7b579ce34747555ab0de7fe556d5648515f0ac
parent3da359c140a29c1f45eb7844a6d68aa958cd604c (diff)
downloadffmpeg-streaming-55cf7d9713dc839da47b56a19c97dc1b943d7d72.zip
ffmpeg-streaming-55cf7d9713dc839da47b56a19c97dc1b943d7d72.tar.gz
lavd/v4l2: remove unneeded variable in device_init()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavdevice/v4l2.c4
1 files changed, 1 insertions, 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)) {
OpenPOWER on IntegriCloud