diff options
author | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 17:54:04 +0000 |
---|---|---|
committer | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 17:54:04 +0000 |
commit | 90caf65af4eaa06b4c72bc22ba46363633b94029 (patch) | |
tree | 52c9aef4a2ab03de91720619eef7b0c5b8b668ed /webkit/glue/webvideoframe_impl.cc | |
parent | 8157198176d0e92bc2a1b9892c70b11b1f7be8ba (diff) | |
download | chromium_src-90caf65af4eaa06b4c72bc22ba46363633b94029.zip chromium_src-90caf65af4eaa06b4c72bc22ba46363633b94029.tar.gz chromium_src-90caf65af4eaa06b4c72bc22ba46363633b94029.tar.bz2 |
Linux: More gcc 4.5 NULL versus 0 fixes.
BUG=49533
TEST=compiles with gcc 4.5 and on trybots.
Review URL: http://codereview.chromium.org/3433005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webvideoframe_impl.cc')
-rw-r--r-- | webkit/glue/webvideoframe_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/webvideoframe_impl.cc b/webkit/glue/webvideoframe_impl.cc index e1195a7..a838cd6 100644 --- a/webkit/glue/webvideoframe_impl.cc +++ b/webkit/glue/webvideoframe_impl.cc @@ -60,25 +60,25 @@ WebVideoFrame::Format WebVideoFrameImpl::format() const { unsigned WebVideoFrameImpl::width() const { if (video_frame_.get()) return video_frame_->width(); - return NULL; + return 0; } unsigned WebVideoFrameImpl::height() const { if (video_frame_.get()) return video_frame_->height(); - return NULL; + return 0; } unsigned WebVideoFrameImpl::planes() const { if (video_frame_.get()) return video_frame_->planes(); - return NULL; + return 0; } int WebVideoFrameImpl::stride(unsigned plane) const { if (video_frame_.get()) return static_cast<int>(video_frame_->stride(plane)); - return NULL; + return 0; } const void* WebVideoFrameImpl::data(unsigned plane) const { |