generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reverting r1749.

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@1750 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org 2012-02-23 10:15:04 +00:00
parent cb57f9ba95
commit a556b0d193
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DEPS
View File

@ -69,8 +69,10 @@ deps = {
"trunk/third_party/yasm/binaries": "trunk/third_party/yasm/binaries":
Var("chromium_trunk") + "/deps/third_party/yasm/binaries@74228", 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": "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 # Used by tools/quality_tracking/dashboard and tools/python_charts
"trunk/third_party/google-visualization-python": "trunk/third_party/google-visualization-python":

2
src/common_video/libyuv/libyuv.cc
View File

@ -49,8 +49,6 @@ VideoType RawVideoTypeToCommonVideoVideoType(RawVideoType type) {
return kNV12; return kNV12;
case kVideoBGRA: case kVideoBGRA:
return kBGRA; return kBGRA;
case kVideoMJPEG:
return kMJPG;
default: default:
assert(false); assert(false);
} }