commit fa5fcd671de2f6db6249c3cdd2908f4fc39d84a0
author buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Jul 21 21:55:43 2014 +0000
committer buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Jul 21 21:55:43 2014 +0000
tree 32c6357a439a7c48e19671e9941c847c49f534a6
parent e69b0619266b9aab55feded823e4c44d7be51a8c

(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

diff --git a/talk/media/webrtc/webrtcvideocapturer.cc b/talk/media/webrtc/webrtcvideocapturer.cc
index d7fc1b2..eb52b93 100644
--- a/talk/media/webrtc/webrtcvideocapturer.cc
+++ b/talk/media/webrtc/webrtcvideocapturer.cc
@@ -53,10 +53,10 @@
 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.