[FFmpeg-cvslog] lavd/v4l2: remove unneeded variable in device_init()
Giorgio Vazzana
git at videolan.org
Fri Sep 5 18:51:54 CEST 2014
ffmpeg | branch: master | Giorgio Vazzana <mywing81 at gmail.com> | Fri Sep 5 17:34:51 2014 +0200| [55cf7d9713dc839da47b56a19c97dc1b943d7d72] | committer: Michael Niedermayer
lavd/v4l2: remove unneeded variable in device_init()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55cf7d9713dc839da47b56a19c97dc1b943d7d72
---
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)) {
More information about the ffmpeg-cvslog
mailing list