# HG changeset patch
# User lucabe
# Date 1178792082 0
# Node ID 4b07eb8709f26888b04324aec1517226ffb4e3ed
# Parent  7b4df9e3b6fd3b2b161b315b28ce01a265becdfc
Allow avoid setting the video standard and input when capturing v4l2 video.
Patch by Limin Wang, edited by me

diff -r 7b4df9e3b6fd -r 4b07eb8709f2 v4l2.c
--- a/v4l2.c	Wed May 09 23:07:40 2007 +0000
+++ b/v4l2.c	Thu May 10 10:14:42 2007 +0000
@@ -429,6 +429,7 @@
     struct v4l2_standard standard;
     int i;
 
+    if(ap->channel>=0) {
     /* set tv video input */
     memset (&input, 0, sizeof (input));
     input.index = ap->channel;
@@ -444,7 +445,9 @@
             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 */
@@ -469,6 +472,7 @@
             ap->standard);
         return AVERROR_IO;
     }
+    }
 
     return 0;
 }