[Sumover-dev] [svn commit] r3947 - vic/branches/mpeg4/video

[sumover-dev at cs.ucl.ac.uk]

Author: barz
Date: Tue Dec  5 08:31:43 2006
New Revision: 3947

Modified:
   vic/branches/mpeg4/video/grabber-v4l2.cpp
   vic/branches/mpeg4/video/grabber-video4linux.cpp

Log:
fix grabber-v4l2 to support ntsc

Modified: vic/branches/mpeg4/video/grabber-v4l2.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-v4l2.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-v4l2.cpp	Tue Dec  5 08:31:43 2006
@@ -442,13 +442,13 @@
 
 
                 if (strcmp(argv[1], "type") == 0 || strcmp(argv[1], "format") == 0) {
-                        
+				
                         for (int k = 0, err = 0; err == 0; ++k)
         		{
                 		struct v4l2_standard     estd;
                 		estd.index = k;
                 		if ( !(err = ioctl(fd_, VIDIOC_ENUMSTD, &estd)) )
-					if ( strcmp(argv[2], (const char *)estd.name) == 0)
+					if (strcasecmp(argv[2], (const char *)estd.name) == 0)
 						norm_ = k;          
 			}     	     
 

Modified: vic/branches/mpeg4/video/grabber-video4linux.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-video4linux.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-video4linux.cpp	Tue Dec  5 08:31:43 2006
@@ -525,6 +525,7 @@
 		norm_ = VIDEO_MODE_SECAM;
 	    else
 		norm_ = VIDEO_MODE_NTSC;
+	    
 	    if (running_)
 		format();
 	    return (TCL_OK);