From 455370d5b1f59225cdf0243512836704e69e89c0 Mon Sep 17 00:00:00 2001
From: "vikasmarwaha@webrtc.org"
 <vikasmarwaha@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 20 Mar 2013 16:57:09 +0000
Subject: [PATCH] Thread safety issue fix in incoming_video_stream.cc. See
 issue 1465. Review URL: https://webrtc-codereview.appspot.com/1216009

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3693 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/modules/video_render/incoming_video_stream.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webrtc/modules/video_render/incoming_video_stream.cc b/webrtc/modules/video_render/incoming_video_stream.cc
index 8815142f58..ffeb9e8c1c 100644
--- a/webrtc/modules/video_render/incoming_video_stream.cc
+++ b/webrtc/modules/video_render/incoming_video_stream.cc
@@ -292,12 +292,13 @@ bool IncomingVideoStream::IncomingVideoStreamThreadFun(void* obj) {
 
 bool IncomingVideoStream::IncomingVideoStreamProcess() {
   if (kEventError != deliver_buffer_event_.Wait(KEventMaxWaitTimeMs)) {
+    thread_critsect_.Enter();
     if (incoming_render_thread_ == NULL) {
       // Terminating
+      thread_critsect_.Leave();
       return false;
     }
 
-    thread_critsect_.Enter();
     I420VideoFrame* frame_to_render = NULL;
 
     // Get a new frame to render and the time for the frame after this one.