Merge /branches/3.2:r1380 to /trunk
git-svn-id: http://webrtc.googlecode.com/svn/trunk@1523 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
6cf529d082
commit
eeaf3d1fc1
@ -1418,6 +1418,6 @@ int VoEFileImpl::GetPlaybackPosition(int channel, int& positionMs)
|
|||||||
return channelPtr->GetLocalPlayoutPosition(positionMs);
|
return channelPtr->GetLocalPlayoutPosition(positionMs);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace webrtc
|
|
||||||
|
|
||||||
#endif // #ifdef WEBRTC_VOICE_ENGINE_FILE_API
|
#endif // #ifdef WEBRTC_VOICE_ENGINE_FILE_API
|
||||||
|
|
||||||
|
} // namespace webrtc
|
||||||
|
Loading…
x
Reference in New Issue
Block a user