diff --git a/DEPS b/DEPS index 744d438387..77e59e8340 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 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); }