From eeaf3d1fc11339db4ccfb3c22c8a99f42d4b4d1c Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Tue, 24 Jan 2012 06:30:02 +0000 Subject: [PATCH] Merge /branches/3.2:r1380 to /trunk git-svn-id: http://webrtc.googlecode.com/svn/trunk@1523 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/voice_engine/main/source/voe_file_impl.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/voice_engine/main/source/voe_file_impl.cc b/src/voice_engine/main/source/voe_file_impl.cc index 16bac9fe1b..cd3193fd6e 100644 --- a/src/voice_engine/main/source/voe_file_impl.cc +++ b/src/voice_engine/main/source/voe_file_impl.cc @@ -1418,6 +1418,6 @@ int VoEFileImpl::GetPlaybackPosition(int channel, int& positionMs) return channelPtr->GetLocalPlayoutPosition(positionMs); } -} // namespace webrtc - #endif // #ifdef WEBRTC_VOICE_ENGINE_FILE_API + +} // namespace webrtc