Merge /branches/3.2:r1380 to /trunk

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1523 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-01-24 06:30:02 +00:00 · 2012-01-24 06:30:02 +00:00 · eeaf3d1fc1
commit eeaf3d1fc1
parent 6cf529d082
1 changed files with 2 additions and 2 deletions
--- 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