diff --git a/media/webrtc/trunk/webrtc/api/video/i420_buffer.cc b/media/webrtc/trunk/webrtc/api/video/i420_buffer.cc
index d9f73085f671..20af2c2289a7 100644
--- a/media/webrtc/trunk/webrtc/api/video/i420_buffer.cc
+++ b/media/webrtc/trunk/webrtc/api/video/i420_buffer.cc
@@ -221,10 +221,10 @@ void I420Buffer::CropAndScaleFrom(const I420BufferInterface& src,
 }
 
 void I420Buffer::CropAndScaleFrom(const I420BufferInterface& src) {
-  const int crop_width =
-      std::min(src.width(), width() * src.height() / height());
-  const int crop_height =
-      std::min(src.height(), height() * src.width() / width());
+  const int crop_width = height() ?
+      std::min(src.width(), width() * src.height() / height()) : src.width();
+  const int crop_height = width() ?
+      std::min(src.height(), height() * src.width() / width()) : src.height();
 
   CropAndScaleFrom(
       src,