[FFmpeg-cvslog] r8973 - trunk/libavformat/v4l2.c

[lucabe]

Author: lucabe
Date: Thu May 10 12:15:15 2007
New Revision: 8973

Log:
Reindent code after last commit


Modified:
   trunk/libavformat/v4l2.c

Modified: trunk/libavformat/v4l2.c
==============================================================================
--- trunk/libavformat/v4l2.c	(original)
+++ trunk/libavformat/v4l2.c	Thu May 10 12:15:15 2007
@@ -430,48 +430,48 @@ static int v4l2_set_parameters( AVFormat
     int i;
 
     if(ap->channel>=0) {
-    /* set tv video input */
-    memset (&input, 0, sizeof (input));
-    input.index = ap->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_IO;
-    }
+        /* set tv video input */
+        memset (&input, 0, sizeof (input));
+        input.index = ap->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_IO;
+        }
 
-    av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set input_id: %d, input: %s\n",
-           ap->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",
-            ap->channel);
-        return AVERROR_IO;
-    }
+        av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set input_id: %d, input: %s\n",
+               ap->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",
+                   ap->channel);
+            return AVERROR_IO;
+        }
     }
 
     if(ap->standard) {
-    av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n",
-           ap->standard );
-    /* set tv standard */
-    memset (&standard, 0, sizeof (standard));
-    for(i=0;;i++) {
-        standard.index = i;
-        if (ioctl(s->fd, VIDIOC_ENUMSTD, &standard) < 0) {
+        av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n",
+               ap->standard );
+        /* set tv standard */
+        memset (&standard, 0, sizeof (standard));
+        for(i=0;;i++) {
+            standard.index = i;
+            if (ioctl(s->fd, VIDIOC_ENUMSTD, &standard) < 0) {
+                av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set standard(%s) failed\n",
+                       ap->standard);
+                return AVERROR_IO;
+            }
+
+            if(!strcasecmp(standard.name, ap->standard)) {
+                break;
+            }
+        }
+
+        av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s, id: %"PRIu64"\n",
+               ap->standard, standard.id);
+        if (ioctl(s->fd, VIDIOC_S_STD, &standard.id) < 0) {
             av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set standard(%s) failed\n",
                    ap->standard);
             return AVERROR_IO;
         }
-
-        if(!strcasecmp(standard.name, ap->standard)) {
-            break;
-        }
-    }
-
-    av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s, id: %"PRIu64"\n",
-           ap->standard, standard.id);
-    if (ioctl(s->fd, VIDIOC_S_STD, &standard.id) < 0) {
-        av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set standard(%s) failed\n",
-            ap->standard);
-        return AVERROR_IO;
-    }
     }
 
     return 0;