summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
Diffstat (limited to 'media/base')
-rw-r--r--media/base/data_buffer.cc4
-rw-r--r--media/base/pipeline_impl.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/media/base/data_buffer.cc b/media/base/data_buffer.cc
index a78cf3d..31b3c1c 100644
--- a/media/base/data_buffer.cc
+++ b/media/base/data_buffer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -41,7 +41,7 @@ uint8* DataBuffer::GetWritableData() {
void DataBuffer::SetDataSize(size_t data_size) {
- DCHECK(data_size <= buffer_size_);
+ DCHECK_LE(data_size, buffer_size_);
data_size_ = data_size;
}
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 25bdf47..d7ad574 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -457,7 +457,7 @@ PipelineImpl::State PipelineImpl::FindNextState(State current) {
void PipelineImpl::SetError(PipelineStatus error) {
DCHECK(IsRunning());
- DCHECK(error != PIPELINE_OK) << "PIPELINE_OK isn't an error!";
+ DCHECK_NE(PIPELINE_OK, error);
VLOG(1) << "Media pipeline error: " << error;
message_loop_->PostTask(FROM_HERE,