From: Anton Khirnov Date: Tue, 24 May 2011 05:23:29 +0000 (+0200) Subject: v4l2: reindent. X-Git-Tag: android-x86-4.4-r1~12310^2~1163 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3d2a418605b23b475b4217a93e8e60660154e198;p=android-x86%2Fexternal-ffmpeg.git v4l2: reindent. --- diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 59af2c83ec..0385a2c6c0 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -456,21 +456,21 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) if (ap->channel > 0) s->channel = ap->channel; - /* set tv video input */ - memset (&input, 0, sizeof (input)); - input.index = s->channel; - if (ioctl(s->fd, VIDIOC_ENUMINPUT, &input) < 0) { - av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl enum input failed:\n"); - return AVERROR(EIO); - } + /* set tv video input */ + memset (&input, 0, sizeof (input)); + input.index = s->channel; + if (ioctl(s->fd, VIDIOC_ENUMINPUT, &input) < 0) { + av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl enum input failed:\n"); + return AVERROR(EIO); + } - av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set input_id: %d, input: %s\n", - s->channel, input.name); - if (ioctl(s->fd, VIDIOC_S_INPUT, &input.index) < 0) { - av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set input(%d) failed\n", - s->channel); - return AVERROR(EIO); - } + av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set input_id: %d, input: %s\n", + s->channel, input.name); + if (ioctl(s->fd, VIDIOC_S_INPUT, &input.index) < 0) { + av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set input(%d) failed\n", + s->channel); + return AVERROR(EIO); + } #if FF_API_FORMAT_PARAMETERS if (ap->standard) {