generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavd/v4l2: remove unneeded variable in device_init()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Giorgio Vazzana 2014-09-05 17:34:51 +02:00 committed by Michael Niedermayer
parent 3da359c140
commit 55cf7d9713
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavdevice/v4l2.c
View File

@ -186,10 +186,8 @@ static int device_init(AVFormatContext *ctx, int *width, int *height,
uint32_t pix_fmt) uint32_t pix_fmt)
{ {
struct video_data *s = ctx->priv_data; struct video_data *s = ctx->priv_data;
int fd = s->fd;
struct v4l2_format fmt = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE }; struct v4l2_format fmt = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE };
struct v4l2_pix_format *pix = &fmt.fmt.pix; struct v4l2_pix_format *pix = &fmt.fmt.pix;
int res = 0; int res = 0;
pix->width = *width; pix->width = *width;
@ -197,7 +195,7 @@ static int device_init(AVFormatContext *ctx, int *width, int *height,
pix->pixelformat = pix_fmt; pix->pixelformat = pix_fmt;
pix->field = V4L2_FIELD_ANY; 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); res = AVERROR(errno);
if ((*width != fmt.fmt.pix.width) || (*height != fmt.fmt.pix.height)) { if ((*width != fmt.fmt.pix.width) || (*height != fmt.fmt.pix.height)) {