Linux build fixes

Review URL: http://codereview.chromium.org/56068


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12791 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 15 deletions

diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h
index 52ffde9..1f07cd6 100644
--- a/media/filters/ffmpeg_audio_decoder.h
+++ b/media/filters/ffmpeg_audio_decoder.h
@@ -26,7 +26,7 @@ class FFmpegAudioDecoder : public DecoderBase<AudioDecoder, Buffer> {
   virtual void OnDecode(Buffer* input);
 
  private:
-  friend FilterFactoryImpl0<FFmpegAudioDecoder>;
+  friend class FilterFactoryImpl0<FFmpegAudioDecoder>;
   FFmpegAudioDecoder();
   virtual ~FFmpegAudioDecoder();
 
diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc
index 0d3957b..231baae 100644
--- a/media/filters/ffmpeg_glue.cc
+++ b/media/filters/ffmpeg_glue.cc
@@ -20,7 +20,7 @@ int OpenContext(URLContext* h, const char* filename, int flags) {
   h->priv_data = data_source;
   h->flags = URL_RDONLY;
   // TODO(scherkus): data source should be able to tell us if we're streaming.
-  h->is_streamed = FALSE;
+  h->is_streamed = false;
   return 0;
 }
 
@@ -113,11 +113,6 @@ FFmpegGlue::FFmpegGlue() {
 }
 
 FFmpegGlue::~FFmpegGlue() {
-  DataSourceMap::iterator iter = data_sources_.begin();
-  while (iter != data_sources_.end()) {
-    DataSource* data_source = iter->second;
-    iter = data_sources_.erase(iter);
-  }
 }
 
 std::string FFmpegGlue::AddDataSource(DataSource* data_source) {
@@ -131,13 +126,13 @@ std::string FFmpegGlue::AddDataSource(DataSource* data_source) {
 
 void FFmpegGlue::RemoveDataSource(DataSource* data_source) {
   AutoLock auto_lock(lock_);
-  DataSourceMap::iterator iter = data_sources_.begin();
-  while (iter != data_sources_.end()) {
-    if (iter->second == data_source) {
-      iter = data_sources_.erase(iter);
-    } else {
-      ++iter;
-    }
+  for (DataSourceMap::iterator cur, iter = data_sources_.begin();
+       iter != data_sources_.end();) {
+    cur = iter;
+    iter++;
+
+    if (cur->second == data_source)
+      data_sources_.erase(cur);
   }
 }
 
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index a047823..67941c6 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -26,7 +26,7 @@ class FFmpegVideoDecoder : public DecoderBase<VideoDecoder, VideoFrame> {
   virtual void OnDecode(Buffer* input);
 
  private:
-  friend FilterFactoryImpl0<FFmpegVideoDecoder>;
+  friend class FilterFactoryImpl0<FFmpegVideoDecoder>;
   FFmpegVideoDecoder();
   virtual ~FFmpegVideoDecoder();