virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

lavd/v4l2: simplify first_field()

Browse Source 
There is no need to pass fd as a second parameter. Additionally remove
unneeded curly braces.

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

12
libavdevice/v4l2.c
View File

@ -225,18 +225,16 @@ static int device_init(AVFormatContext *ctx, int *width, int *height,
return res;
}
static int first_field(const struct video_data *s, int fd)
static int first_field(const struct video_data *s)
{
int res;
v4l2_std_id std;
res = v4l2_ioctl(fd, VIDIOC_G_STD, &std);
if (res < 0) {
res = v4l2_ioctl(s->fd, VIDIOC_G_STD, &std);
if (res < 0)
return 0;
}
if (std & V4L2_STD_NTSC) {
if (std & V4L2_STD_NTSC)
return 0;
}
return 1;
}
@ -935,7 +933,7 @@ static int v4l2_read_header(AVFormatContext *ctx)
(res = mmap_start(ctx)) < 0)
goto fail;
s->top_field_first = first_field(s, s->fd);
s->top_field_first = first_field(s);
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = codec_id;