diff options
| author | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-02-03 16:57:16 +0000 |
|---|---|---|
| committer | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-02-03 16:57:16 +0000 |
| commit | b881d27f23e9a8f52dc6a60fc66ebd75f9c2f15c (patch) | |
| tree | 7e476a94dc6bd821fb3452e8021da5a49c3325df /media/base/videoengine_unittest.h | |
| parent | d51e05ddea8c27cfc8f1e33fd4ef068534280bd5 (diff) | |
| download | talk-b881d27f23e9a8f52dc6a60fc66ebd75f9c2f15c.tar.gz | |
Update talk to 60923971
Review URL: https://webrtc-codereview.appspot.com/7909004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@5475 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base/videoengine_unittest.h')
| -rw-r--r-- | media/base/videoengine_unittest.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/base/videoengine_unittest.h b/media/base/videoengine_unittest.h index 893f0f3..b667cb0 100644 --- a/media/base/videoengine_unittest.h +++ b/media/base/videoengine_unittest.h @@ -1184,6 +1184,8 @@ class VideoMediaChannelTest : public testing::Test, // some (e.g. 1) of these 3 frames after the renderer is set again. EXPECT_GT_FRAME_ON_RENDERER_WAIT( renderer1, 2, DefaultCodec().width, DefaultCodec().height, kTimeout); + // Detach |renderer1| before exit as there might be frames come late. + EXPECT_TRUE(channel_->SetRenderer(kSsrc, NULL)); } // Tests the behavior of incoming streams in a conference scenario. |