Browse Source

lavd/v4l2: remove unneeded variable in device_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4
Giorgio Vazzana Michael Niedermayer 10 years ago
parent
commit
55cf7d9713
1 changed files with 1 additions and 3 deletions
  1. +1
    -3
      libavdevice/v4l2.c

+ 1
- 3
libavdevice/v4l2.c View File

@@ -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)) {


Loading…
Cancel
Save