DShow: cleaning and cosmetics

diff --git a/modules/access/dshow/access.h b/modules/access/dshow/access.h
index eff382d14aa95027cd27a662763ffac61af44a7f..f9ef1dc06bfa924f835e8a8ddaf371605b928e53 100644 (file)
--- a/modules/access/dshow/access.h
+++ b/modules/access/dshow/access.h
@@ -1,7 +1,8 @@
 /*****************************************************************************
- * common.h : DirectShow access module for vlc
+ * access.h : DirectShow access module for vlc
+ * access_sys_t definition
  *****************************************************************************
- * Copyright (C) 2002, 2004, 2010 the VideoLAN team
+ * Copyright (C) 2002, 2004, 2010-2011 the VideoLAN team
  * $Id$
  *
  * Author: Gildas Bazin <gbazin@videolan.org>
@@ -24,9 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <string>
-#include <list>
-#include <deque>
 using namespace std;
 
 #ifndef _MSC_VER

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 208d91678362e2f727541d322449dd7550617f23..2088b0b9a38aa066f56a1c4e55833cf3d501aa4c 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -34,6 +34,8 @@
 #define __STDC_FORMAT_MACROS 1
 #define CFG_PREFIX "dshow-"
 #include <inttypes.h>
+#include <list>
+#include <string>
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>

diff --git a/modules/access/dshow/filter.h b/modules/access/dshow/filter.h
index a07888bbadffe42eb258545fd9410867b921fc67..c573a6a2f9eec62af37343dee39f7db0364ab888 100644 (file)
--- a/modules/access/dshow/filter.h
+++ b/modules/access/dshow/filter.h
@@ -25,8 +25,7 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <string>
-#include <list>
+
 #include <deque>
 using namespace std;
 
@@ -58,8 +57,7 @@ typedef struct VLCMediaSample
 
 } VLCMediaSample;
 
-class CaptureFilter;
-
+/* */
 void WINAPI FreeMediaType( AM_MEDIA_TYPE& mt );
 HRESULT WINAPI CopyMediaType( AM_MEDIA_TYPE *pmtTarget,
                               const AM_MEDIA_TYPE *pmtSource );
@@ -69,6 +67,7 @@ int GetFourCCFromMediaType(const AM_MEDIA_TYPE &media_type);
 /****************************************************************************
  * Declaration of our dummy directshow filter pin class
  ****************************************************************************/
+class CaptureFilter;
 class CapturePin: public IPin, public IMemInputPin
 {
     friend class CaptureEnumMediaTypes;

diff --git a/modules/access/dshow/vlc_dshow.h b/modules/access/dshow/vlc_dshow.h
index c0a9162c6fe78b38d36053b35d2243a96eec55a0..5597d84257a252b23accf8f72652bcef4105aeb1 100644 (file)
--- a/modules/access/dshow/vlc_dshow.h
+++ b/modules/access/dshow/vlc_dshow.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * common.h : DirectShow access module for vlc
+ * vlc_dshow.h : DirectShow access module for vlc
  *****************************************************************************
- * Copyright (C) 2002, 2004, 2010 the VideoLAN team
+ * Copyright (C) 2002, 2004, 2010-2011 the VideoLAN team
  * $Id$
  *
  * Author: Gildas Bazin <gbazin@videolan.org>
@@ -24,10 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <string>
-#include <list>
-#include <deque>
-using namespace std;
 
 #ifndef _MSC_VER
 #   include <wtypes.h>