Use BITMAPINFOHEADER from capture capability enumeration when using MJPG

media/video/capture/win/capability_list_win.h

Index: media/video/capture/win/capability_list_win.h
diff --git a/media/video/capture/win/capability_list_win.h b/media/video/capture/win/capability_list_win.h
index e173439cd4d33c72e83ad54d183cee10a310af4c..5ff2fd8ad25ee852d67ce83dc211a1aebb1e2a43 100644
--- a/media/video/capture/win/capability_list_win.h
+++ b/media/video/capture/win/capability_list_win.h
@@ -10,6 +10,7 @@
 #define MEDIA_VIDEO_CAPTURE_WIN_CAPABILITY_LIST_WIN_H_
 
 #include <list>
+#include <windows.h>
 
 #include "media/video/capture/video_capture_types.h"
 
@@ -18,14 +19,27 @@ namespace media {
 struct CapabilityWin {
   CapabilityWin(int index, const VideoCaptureFormat& format)
       : stream_index(index), supported_format(format) {}
-  int stream_index;
-  VideoCaptureFormat supported_format;
+
+  // Used by the DirectShow implementation VideoCaptureDeviceWin.

[tommi (sloooow) - chröme, 2015/02/13 14:50:09]

Used by VideoCaptureDeviceWin (?)

+  CapabilityWin(int index, const VideoCaptureFormat& format,
+      const BITMAPINFOHEADER& info_header)
+      : stream_index(index),
+        supported_format(format),
+        info_header(info_header) {
+  }
+
+  const int stream_index;
+  const VideoCaptureFormat supported_format;
+
+  // |info_header| is only valid if DirectShow is used.
+  const BITMAPINFOHEADER info_header;

[tommi (sloooow) - chröme, 2015/02/13 14:50:09]

nice constness

 };
 
 typedef std::list<CapabilityWin> CapabilityList;
 
-CapabilityWin GetBestMatchedCapability(const VideoCaptureFormat& requested,
-                                       const CapabilityList& capabilities);
+const CapabilityWin& GetBestMatchedCapability(
+    const VideoCaptureFormat& requested,
+    const CapabilityList& capabilities);
 
 }  // namespace media