virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavd/v4l2: simplify list_framesizes()

Browse Source 
We can avoid passing file descriptor fd explicitely.

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

6
libavdevice/v4l2.c
View File

@ -238,12 +238,12 @@ static int first_field(const struct video_data *s)
} }
#if HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE #if HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE
static void list_framesizes(AVFormatContext *ctx, int fd, uint32_t pixelformat) static void list_framesizes(AVFormatContext *ctx, uint32_t pixelformat)
{ {
const struct video_data *s = ctx->priv_data; const struct video_data *s = ctx->priv_data;
struct v4l2_frmsizeenum vfse = { .pixel_format = pixelformat }; struct v4l2_frmsizeenum vfse = { .pixel_format = pixelformat };
while(!v4l2_ioctl(fd, VIDIOC_ENUM_FRAMESIZES, &vfse)) { while(!v4l2_ioctl(s->fd, VIDIOC_ENUM_FRAMESIZES, &vfse)) {
switch (vfse.type) { switch (vfse.type) {
case V4L2_FRMSIZE_TYPE_DISCRETE: case V4L2_FRMSIZE_TYPE_DISCRETE:
av_log(ctx, AV_LOG_INFO, " %ux%u", av_log(ctx, AV_LOG_INFO, " %ux%u",
@ -296,7 +296,7 @@ static void list_formats(AVFormatContext *ctx, int fd, int type)
av_log(ctx, AV_LOG_INFO, " Emulated :"); av_log(ctx, AV_LOG_INFO, " Emulated :");
#endif #endif
#if HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE #if HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE
list_framesizes(ctx, fd, vfd.pixelformat); list_framesizes(ctx, vfd.pixelformat);
#endif #endif
av_log(ctx, AV_LOG_INFO, "\n"); av_log(ctx, AV_LOG_INFO, "\n");
} }