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

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

Author: douglask
Date: Mon Feb  9 03:27:17 2009
New Revision: 4380

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

Log:
replaced '||' with '&&' in a conditional due to De Morgan's laws not being applied correctly in a previous check-in


Modified: vic/branches/mpeg4/video/grabber-v4l2.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-v4l2.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-v4l2.cpp	Mon Feb  9 03:27:17 2009
@@ -950,7 +950,7 @@
                                                 inw_ = width_ = fmt.fmt.pix.width;
 
 
-                                        if ( ( fmt.fmt.pix.width == (unsigned int)width_ ) ||
+                                        if ( ( fmt.fmt.pix.width == (unsigned int)width_ ) &&
                                                                 ( fmt.fmt.pix.height == (unsigned int)height_ ) )  {
                                                 debug_msg("V4L2: setting format: width=%d height=%d\n", fmt.fmt.pix.width, fmt.fmt.pix.height);
                                                 format_ok = 1;