Merge 279078 "Video Capture: Allow 0 fps frame rates to be deser..."

media/video/capture/video_capture_types.cc

Index: media/video/capture/video_capture_types.cc
===================================================================
--- media/video/capture/video_capture_types.cc	(revision 287597)
+++ media/video/capture/video_capture_types.cc	(working copy)
@@ -9,7 +9,7 @@
 namespace media {
 
 VideoCaptureFormat::VideoCaptureFormat()
-    : frame_rate(0), pixel_format(PIXEL_FORMAT_UNKNOWN) {}
+    : frame_rate(0.0f), pixel_format(PIXEL_FORMAT_UNKNOWN) {}
 
 VideoCaptureFormat::VideoCaptureFormat(const gfx::Size& frame_size,
                                        float frame_rate,
@@ -23,7 +23,7 @@
          (frame_size.height() < media::limits::kMaxDimension) &&
          (frame_size.GetArea() >= 0) &&
          (frame_size.GetArea() < media::limits::kMaxCanvas) &&
-         (frame_rate > 0) &&
+         (frame_rate >= 0.0f) &&
          (frame_rate < media::limits::kMaxFramesPerSecond) &&
          (pixel_format >= PIXEL_FORMAT_UNKNOWN) &&
          (pixel_format < PIXEL_FORMAT_MAX);