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

Relanding r1749.

Browse Source 
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
This commit is contained in:
mflodman@webrtc.org 2012-02-24 11:53:49 +00:00
parent 8df260023b
commit 2f6104bb93
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -52,7 +52,7 @@ deps = {
"http://git.chromium.org/webm/libvpx.git@v1.0.0", "http://git.chromium.org/webm/libvpx.git@v1.0.0",
"trunk/third_party/libyuv": "trunk/third_party/libyuv":
(Var("googlecode_url") % "libyuv") + "/trunk@182", (Var("googlecode_url") % "libyuv") + "/trunk@188",
"trunk/third_party/protobuf": "trunk/third_party/protobuf":
Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"), Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),

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

@ -49,6 +49,8 @@ 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);
} }