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

lavd/v4l2: simplify list_formats()

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:43:59 +02:00 committed by Michael Niedermayer
parent 0a7239ae25
commit 0b890425e3
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

@ -264,12 +264,12 @@ static void list_framesizes(AVFormatContext *ctx, uint32_t pixelformat)
} }
#endif #endif
static void list_formats(AVFormatContext *ctx, int fd, int type) static void list_formats(AVFormatContext *ctx, int type)
{ {
const struct video_data *s = ctx->priv_data; const struct video_data *s = ctx->priv_data;
struct v4l2_fmtdesc vfd = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE }; struct v4l2_fmtdesc vfd = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE };
while(!v4l2_ioctl(fd, VIDIOC_ENUM_FMT, &vfd)) { while(!v4l2_ioctl(s->fd, VIDIOC_ENUM_FMT, &vfd)) {
enum AVCodecID codec_id = avpriv_fmt_v4l2codec(vfd.pixelformat); enum AVCodecID codec_id = avpriv_fmt_v4l2codec(vfd.pixelformat);
enum AVPixelFormat pix_fmt = avpriv_fmt_v4l2ff(vfd.pixelformat, codec_id); enum AVPixelFormat pix_fmt = avpriv_fmt_v4l2ff(vfd.pixelformat, codec_id);
@ -857,7 +857,7 @@ static int v4l2_read_header(AVFormatContext *ctx)
s->channel, input.name, (uint64_t)input.std); s->channel, input.name, (uint64_t)input.std);
if (s->list_format) { if (s->list_format) {
list_formats(ctx, s->fd, s->list_format); list_formats(ctx, s->list_format);
res = AVERROR_EXIT; res = AVERROR_EXIT;
goto fail; goto fail;
} }