summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 13:43:42 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 13:43:42 +0000
commit659f73fa7b0a91ceef30e89fff34629f39853761 (patch)
tree54856047a10c8ba93f82c725cb0e3ee5283e707d /media
parentb2be7a6889ea1af900760b6e69e22152f652e950 (diff)
downloadchromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.zip
chromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.tar.gz
chromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.tar.bz2
Turn NULL used as int to 0.
(Excluding chrome/browser/...) Landing patch for Jacob Mandelson. Original review: http://codereview.chromium.org/195067 BUG=none TEST=base_unittests & app_unittests Review URL: http://codereview.chromium.org/267076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/filters/null_audio_renderer.cc4
-rw-r--r--media/filters/video_renderer_base.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/media/filters/null_audio_renderer.cc b/media/filters/null_audio_renderer.cc
index d977b08..544b588 100644
--- a/media/filters/null_audio_renderer.cc
+++ b/media/filters/null_audio_renderer.cc
@@ -18,7 +18,7 @@ NullAudioRenderer::NullAudioRenderer()
: AudioRendererBase(),
bytes_per_millisecond_(0),
buffer_size_(0),
- thread_(NULL),
+ thread_(kNullThreadHandle),
shutdown_(false) {
}
@@ -89,7 +89,7 @@ void NullAudioRenderer::OnStop() {
shutdown_ = true;
if (thread_) {
PlatformThread::Join(thread_);
- thread_ = NULL;
+ thread_ = kNullThreadHandle;
}
}
diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
index 5a320c9..77a736d 100644
--- a/media/filters/video_renderer_base.cc
+++ b/media/filters/video_renderer_base.cc
@@ -39,7 +39,7 @@ VideoRendererBase::VideoRendererBase()
height_(0),
frame_available_(&lock_),
state_(kUninitialized),
- thread_(NULL),
+ thread_(kNullThreadHandle),
pending_reads_(0),
playback_rate_(0) {
}
@@ -105,7 +105,7 @@ void VideoRendererBase::Stop() {
AutoUnlock auto_unlock(lock_);
PlatformThread::Join(thread_);
}
- thread_ = NULL;
+ thread_ = kNullThreadHandle;
}
}