Update talk to 50918584.

Together with Stefan's http://review.webrtc.org/1960004/.

R=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2048004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4556 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org
2013-08-15 23:38:54 +00:00
parent dde7d4c6ed
commit 822fbd8b68
108 changed files with 2926 additions and 4301 deletions

View File

@ -147,12 +147,12 @@ int32_t FileOutputFrameReceiver::FrameToRender(
return 0;
}
webrtc::RTPVideoCodecTypes ConvertCodecType(const char* plname) {
webrtc::RtpVideoCodecTypes ConvertCodecType(const char* plname) {
if (strncmp(plname,"VP8" , 3) == 0) {
return webrtc::kRTPVideoVP8;
return webrtc::kRtpVideoVp8;
} else if (strncmp(plname,"I420" , 5) == 0) {
return webrtc::kRTPVideoI420;
return webrtc::kRtpVideoI420;
} else {
return webrtc::kRTPVideoNoVideo; // Default value
return webrtc::kRtpVideoNone; // Default value
}
}