From fa5fcd671de2f6db6249c3cdd2908f4fc39d84a0 Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Date: Mon, 21 Jul 2014 21:55:43 +0000 Subject: [PATCH] (Auto)update libjingle 71599033-> 71605904 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6751 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideocapturer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/talk/media/webrtc/webrtcvideocapturer.cc b/talk/media/webrtc/webrtcvideocapturer.cc index d7fc1b2f2..eb52b9304 100644 --- a/talk/media/webrtc/webrtcvideocapturer.cc +++ b/talk/media/webrtc/webrtcvideocapturer.cc @@ -53,10 +53,10 @@ struct kVideoFourCCEntry { static kVideoFourCCEntry kSupportedFourCCs[] = { { FOURCC_I420, webrtc::kVideoI420 }, // 12 bpp, no conversion. { FOURCC_YV12, webrtc::kVideoYV12 }, // 12 bpp, no conversion. - { FOURCC_NV12, webrtc::kVideoNV12 }, // 12 bpp, fast conversion. - { FOURCC_NV21, webrtc::kVideoNV21 }, // 12 bpp, fast conversion. { FOURCC_YUY2, webrtc::kVideoYUY2 }, // 16 bpp, fast conversion. { FOURCC_UYVY, webrtc::kVideoUYVY }, // 16 bpp, fast conversion. + { FOURCC_NV12, webrtc::kVideoNV12 }, // 12 bpp, fast conversion. + { FOURCC_NV21, webrtc::kVideoNV21 }, // 12 bpp, fast conversion. { FOURCC_MJPG, webrtc::kVideoMJPEG }, // compressed, slow conversion. { FOURCC_ARGB, webrtc::kVideoARGB }, // 32 bpp, slow conversion. { FOURCC_24BG, webrtc::kVideoRGB24 }, // 24 bpp, slow conversion.