Reapply linux build fix patch to ffmepg glue code from r12791 that was lost in r12802.

Original CL: http://codereview.chromium.org/62054

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

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

1 files changed, 7 insertions, 12 deletions

diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc
index b1149c3..820f850 100644
--- a/media/filters/ffmpeg_glue.cc
+++ b/media/filters/ffmpeg_glue.cc
@@ -112,11 +112,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) {
@@ -130,13 +125,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);
   }
 }