Mercurial > mplayer.hg
diff libvo/vo_v4l2.c @ 29263:0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
author | diego |
---|---|
date | Wed, 13 May 2009 02:58:57 +0000 |
parents | 56eee6ffba9b |
children | 1772a5171ac7 |
line wrap: on
line diff
--- a/libvo/vo_v4l2.c Tue May 12 19:25:35 2009 +0000 +++ b/libvo/vo_v4l2.c Wed May 13 02:58:57 2009 +0000 @@ -59,7 +59,7 @@ {NULL} }; -static const vo_info_t info = +static const vo_info_t info = { "V4L2 MPEG Video Decoder Output", "v4l2", @@ -73,7 +73,7 @@ { if (v4l2_fd < 0) return 0; - + return write (v4l2_fd, data, len); } @@ -107,30 +107,30 @@ "\n" ); return -1; } - + if (!device) - device = strdup (DEFAULT_MPEG_DECODER); - + device = strdup (DEFAULT_MPEG_DECODER); + v4l2_fd = open (device, O_RDWR); if (v4l2_fd < 0) - { + { free (device); mp_msg (MSGT_VO, MSGL_FATAL, "%s %s\n", V4L2_VO_HDR, strerror (errno)); return -1; } /* check for device hardware MPEG decoding capability */ - ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG; - ctrls.count = 0; + ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG; + ctrls.count = 0; ctrls.controls = NULL; - + if (ioctl (v4l2_fd, VIDIOC_G_EXT_CTRLS, &ctrls) < 0) { free (device); mp_msg (MSGT_OPEN, MSGL_FATAL, "%s %s\n", V4L2_VO_HDR, strerror (errno)); return -1; } - + /* list available outputs */ vout.index = 0; err = 1; @@ -186,7 +186,7 @@ "%s can't get output (%s).\n", V4L2_VO_HDR, strerror (errno)); return -1; } - + return 0; } @@ -248,7 +248,7 @@ { if (format != IMGFMT_MPEGPES) return 0; - + return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_TIMER; } @@ -260,6 +260,6 @@ case VOCTRL_QUERY_FORMAT: return query_format (*((uint32_t*) data)); } - + return VO_NOTIMPL; }