| Index: content/browser/renderer_host/media/video_capture_controller.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
|
| index 84dcf8a56d6f86f4f26d89463d6f0c013c727002..2a8f82fc1befdd3b36e69151dda4d25fab922ae2 100644
|
| --- a/content/browser/renderer_host/media/video_capture_controller.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_controller.cc
|
| @@ -13,7 +13,10 @@
|
| #include "content/browser/renderer_host/media/video_capture_manager.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "media/base/yuv_convert.h"
|
| +
|
| +#if !defined(OS_IOS) && !defined(OS_ANDROID)
|
| #include "third_party/libyuv/include/libyuv.h"
|
| +#endif
|
|
|
| namespace content {
|
|
|
| @@ -332,7 +335,7 @@ void VideoCaptureController::OnIncomingCapturedFrame(const uint8* data,
|
| frame_info_.width, frame_info_.width / 2);
|
| break;
|
| }
|
| -#if !defined(OS_IOS)
|
| +#if !defined(OS_IOS) && !defined(OS_ANDROID)
|
| case media::VideoCaptureCapability::kMJPEG: {
|
| int yplane_stride = frame_info_.width;
|
| int uv_plane_stride = (frame_info_.width + 1) / 2;
|
|
|