From cb57f9ba95adae4c91c40fe171d9fa3c5d316286 Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Thu, 23 Feb 2012 09:47:07 +0000 Subject: [PATCH] Updated libyuv revision to include mjpg and added mjpg to type conversion. BUG=306 TEST=libyuv_unittests Review URL: https://webrtc-codereview.appspot.com/407001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1749 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 4 +--- src/common_video/libyuv/libyuv.cc | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 744d43838..77e59e834 100644 --- a/DEPS +++ b/DEPS @@ -69,10 +69,8 @@ deps = { "trunk/third_party/yasm/binaries": Var("chromium_trunk") + "/deps/third_party/yasm/binaries@74228", - # TODO(andrew): roll to 164 after fixing: - # http://code.google.com/p/webrtc/issues/detail?id=267 "trunk/third_party/libyuv": - (Var("googlecode_url") % "libyuv") + "/trunk@182", + (Var("googlecode_url") % "libyuv") + "/trunk@186", # Used by tools/quality_tracking/dashboard and tools/python_charts "trunk/third_party/google-visualization-python": diff --git a/src/common_video/libyuv/libyuv.cc b/src/common_video/libyuv/libyuv.cc index 5b5b260aa..d1ced7ae5 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); }