Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/video/capture/win/sink_filter_win.cc

Issue 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« media/base/video_frame.h ('K') | « media/video/capture/win/sink_filter_win.h ('k') | media/video/capture/win/sink_input_pin_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/win/sink_filter_win.cc
diff --git a/media/video/capture/win/sink_filter_win.cc b/media/video/capture/win/sink_filter_win.cc
index 605d5572a61ef0d1b34f7893a33059347d1116e5..30d445c74adfc802461e817b69282a384455f6f6 100644
--- a/media/video/capture/win/sink_filter_win.cc
+++ b/media/video/capture/win/sink_filter_win.cc
@@ -29,11 +29,11 @@ SinkFilter::~SinkFilter() {
}
void SinkFilter::SetRequestedMediaCapability(
- const VideoCaptureDevice::Capability& capability) {
+ const media::VideoCaptureCapability& capability) {
input_pin_->SetRequestedMediaCapability(capability);
}
-const VideoCaptureDevice::Capability& SinkFilter::ResultingCapability() {
+const media::VideoCaptureCapability& SinkFilter::ResultingCapability() {
return input_pin_->ResultingCapability();
}
« media/base/video_frame.h ('K') | « media/video/capture/win/sink_filter_win.h ('k') | media/video/capture/win/sink_input_pin_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698