From a556b0d193c84846cecfcb13bcbc6237e26e80e4 Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Thu, 23 Feb 2012 10:15:04 +0000 Subject: [PATCH] Reverting r1749. git-svn-id: http://webrtc.googlecode.com/svn/trunk@1750 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 77e59e8340..744d438387 100644 --- a/DEPS +++ b/DEPS @@ -69,8 +69,10 @@ 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@186", + (Var("googlecode_url") % "libyuv") + "/trunk@182", # 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 d1ced7ae5b..5b5b260aae 100644 --- a/src/common_video/libyuv/libyuv.cc +++ b/src/common_video/libyuv/libyuv.cc @@ -49,8 +49,6 @@ VideoType RawVideoTypeToCommonVideoVideoType(RawVideoType type) { return kNV12; case kVideoBGRA: return kBGRA; - case kVideoMJPEG: - return kMJPG; default: assert(false); }