diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-19 01:12:44 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-19 01:12:44 +0000 |
| commit | 74ee77f94e79a277f6bf259e82910ffe8ea3862f (patch) | |
| tree | e5468374eb9590310e90b7df9f9d4c201ad54991 /media | |
| parent | a191a504ea5a65e836e90c207025518cdce1c250 (diff) | |
| download | chromium_src-74ee77f94e79a277f6bf259e82910ffe8ea3862f.zip chromium_src-74ee77f94e79a277f6bf259e82910ffe8ea3862f.tar.gz chromium_src-74ee77f94e79a277f6bf259e82910ffe8ea3862f.tar.bz2 | |
Fix an aggressive DCHECK in media::VideoThread
Only check for null if it is initialized.
Review URL: http://codereview.chromium.org/115498
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/video_thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/filters/video_thread.cc b/media/filters/video_thread.cc index 4422c82..50f02e6 100644 --- a/media/filters/video_thread.cc +++ b/media/filters/video_thread.cc @@ -213,8 +213,8 @@ void VideoThread::ThreadMain() { void VideoThread::GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out) { AutoLock auto_lock(lock_); - DCHECK_EQ(state_, INITIALIZED); - DCHECK(current_frame_); + // Either we have initialized or we have the current frame. + DCHECK(state_ != INITIALIZED || current_frame_); *frame_out = current_frame_; } |