From 2f6104bb937cee78728b108fcc68ddca2ac7fe0f Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Fri, 24 Feb 2012 11:53:49 +0000 Subject: [PATCH] Relanding r1749. BUG=306 TEST=libyuv_unittests Review URL: https://webrtc-codereview.appspot.com/410002 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1762 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 2 +- src/common_video/libyuv/libyuv.cc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index c4b16a59ad..070b210d4d 100644 --- a/DEPS +++ b/DEPS @@ -52,7 +52,7 @@ deps = { "http://git.chromium.org/webm/libvpx.git@v1.0.0", "trunk/third_party/libyuv": - (Var("googlecode_url") % "libyuv") + "/trunk@182", + (Var("googlecode_url") % "libyuv") + "/trunk@188", "trunk/third_party/protobuf": Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"), diff --git a/src/common_video/libyuv/libyuv.cc b/src/common_video/libyuv/libyuv.cc index 5b5b260aae..d1ced7ae5b 100644 --- a/src/common_video/libyuv/libyuv.cc +++ b/src/common_video/libyuv/libyuv.cc @@ -49,6 +49,8 @@ VideoType RawVideoTypeToCommonVideoVideoType(RawVideoType type) { return kNV12; case kVideoBGRA: return kBGRA; + case kVideoMJPEG: + return kMJPG; default: assert(false); }