From ac3a9ea086942ff063ceb4698df9299efae18465 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 7 Mar 2013 19:26:24 -0500
Subject: [PATCH] Backed out changeset 8ff35a246bb0 (bug 828917) to see if it
 resolves the Win PGO mochitest-2 crashes.

---
 .../trunk/webrtc/modules/video_render/incoming_video_stream.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media/webrtc/trunk/webrtc/modules/video_render/incoming_video_stream.cc b/media/webrtc/trunk/webrtc/modules/video_render/incoming_video_stream.cc
index ffeb9e8c1c41..8815142f5871 100644
--- a/media/webrtc/trunk/webrtc/modules/video_render/incoming_video_stream.cc
+++ b/media/webrtc/trunk/webrtc/modules/video_render/incoming_video_stream.cc
@@ -292,13 +292,12 @@ 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.