Reland r101418: Fix aspect ratio and clarify video frame dimensions

media/base/composite_filter.h

Index: media/base/composite_filter.h
diff --git a/media/base/composite_filter.h b/media/base/composite_filter.h
index 8e1ec4afa568c62a38c766de995a009d5ffc1cf0..ad070bc16b8dfc729ee8ae22dc6c28f8461427cd 100644
--- a/media/base/composite_filter.h
+++ b/media/base/composite_filter.h
@@ -27,15 +27,16 @@ class MEDIA_EXPORT CompositeFilter : public Filter {
   bool AddFilter(scoped_refptr<Filter> filter);
 
   // media::Filter methods.
-  virtual void set_host(FilterHost* host);
-  virtual FilterHost* host();
-  virtual void Play(FilterCallback* play_callback);
-  virtual void Pause(FilterCallback* pause_callback);
-  virtual void Flush(FilterCallback* flush_callback);
-  virtual void Stop(FilterCallback* stop_callback);
-  virtual void SetPlaybackRate(float playback_rate);
-  virtual void Seek(base::TimeDelta time, const FilterStatusCB& seek_cb);
-  virtual void OnAudioRendererDisabled();
+  virtual void set_host(FilterHost* host) OVERRIDE;
+  virtual FilterHost* host() OVERRIDE;
+  virtual void Play(FilterCallback* play_callback) OVERRIDE;
+  virtual void Pause(FilterCallback* pause_callback) OVERRIDE;
+  virtual void Flush(FilterCallback* flush_callback) OVERRIDE;
+  virtual void Stop(FilterCallback* stop_callback) OVERRIDE;
+  virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
+  virtual void Seek(
+      base::TimeDelta time, const FilterStatusCB& seek_cb) OVERRIDE;
+  virtual void OnAudioRendererDisabled() OVERRIDE;
 
  protected:
   virtual ~CompositeFilter();