Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/media/video/capture/win/sink_input_pin_win.h

Index: trunk/src/media/video/capture/win/sink_input_pin_win.h
===================================================================
--- trunk/src/media/video/capture/win/sink_input_pin_win.h	(revision 236934)
+++ trunk/src/media/video/capture/win/sink_input_pin_win.h	(working copy)
@@ -24,10 +24,10 @@
   SinkInputPin(IBaseFilter* filter, SinkFilterObserver* observer);
   virtual ~SinkInputPin();
 
-  void SetRequestedMediaFormat(const VideoCaptureFormat& format);
+  void SetRequestedMediaCapability(const VideoCaptureCapability& capability);
   // Returns the capability that is negotiated when this
   // pin is connected to a media filter.
-  const VideoCaptureFormat& ResultingFormat();
+  const VideoCaptureCapability& ResultingCapability();
 
   // Implement PinBase.
   virtual bool IsMediaTypeValid(const AM_MEDIA_TYPE* media_type);
@@ -36,8 +36,8 @@
   STDMETHOD(Receive)(IMediaSample* media_sample);
 
  private:
-  VideoCaptureFormat requested_format_;
-  VideoCaptureFormat resulting_format_;
+  VideoCaptureCapability requested_capability_;
+  VideoCaptureCapability resulting_capability_;
   SinkFilterObserver* observer_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(SinkInputPin);