Merged VideoSurface, VideoFrame and VideoFrameImpl in VideoFrame.

media/filters/ffmpeg_video_decode_engine.h

Index: media/filters/ffmpeg_video_decode_engine.h
diff --git a/media/filters/ffmpeg_video_decode_engine.h b/media/filters/ffmpeg_video_decode_engine.h
index b8338abb2156766cb01844d10eda11387f82941a..0b8383a0e664c39a1622ac054d3abc6acdffac27 100644
--- a/media/filters/ffmpeg_video_decode_engine.h
+++ b/media/filters/ffmpeg_video_decode_engine.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.  Use of this
+// Copyright (c) 2010 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.
 
@@ -27,7 +27,7 @@ class FFmpegVideoDecodeEngine : public VideoDecodeEngine {
   virtual void DecodeFrame(const Buffer& buffer, AVFrame* yuv_frame,
                            bool* got_result, Task* done_cb);
   virtual void Flush(Task* done_cb);
-  virtual VideoSurface::Format GetSurfaceFormat() const;
+  virtual VideoFrame::Format GetSurfaceFormat() const;
 
   virtual State state() const { return state_; }