Lots of files touched for a very simple change. Everywhere we used a const M...

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2009 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.
 
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "media/base/filter_host.h"
 #include "media/filters/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
@@ skipping 105 matching lines @@
   base::TimeDelta duration = time_base_ * packet->duration;
   Buffer* buffer = new AVPacketBuffer(packet, timestamp, duration);
   DCHECK(buffer);
   {
     AutoLock auto_lock(lock_);
     input_queue_.push_back(buffer);
   }
   FulfillPendingReads();
 }
 
-const MediaFormat* FFmpegDemuxerStream::GetMediaFormat() {
-  return &media_format_;
+const MediaFormat& FFmpegDemuxerStream::media_format() {
+  return media_format_;
 }
 
 void FFmpegDemuxerStream::Read(Assignable<Buffer>* buffer) {
   DCHECK(buffer);
   {
     AutoLock auto_lock(lock_);
     output_queue_.push_back(scoped_refptr< Assignable<Buffer> >(buffer));
   }
   if (FulfillPendingReads()) {
     demuxer_->ScheduleDemux();
@@ skipping 146 matching lines @@
   StreamVector::iterator iter;
   for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
     if ((*iter)->HasPendingReads()) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace media