[vlc-commits] DShow: cleaning and cosmetics
Jean-Baptiste Kempf
git at videolan.org
Wed Feb 23 22:33:13 CET 2011
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Feb 23 22:32:51 2011 +0100| [8d10ff29c470a9e82f4fa80e40d9f25586758c03] | committer: Jean-Baptiste Kempf
DShow: cleaning and cosmetics
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d10ff29c470a9e82f4fa80e40d9f25586758c03
---
modules/access/dshow/access.h | 8 +++-----
modules/access/dshow/dshow.cpp | 2 ++
modules/access/dshow/filter.h | 7 +++----
modules/access/dshow/vlc_dshow.h | 8 ++------
4 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/modules/access/dshow/access.h b/modules/access/dshow/access.h
index eff382d..f9ef1dc 100644
--- 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 at 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 208d916..2088b0b 100644
--- 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 a07888b..c573a6a 100644
--- 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 c0a9162..5597d84 100644
--- 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 at videolan.org>
@@ -24,10 +24,6 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <string>
-#include <list>
-#include <deque>
-using namespace std;
#ifndef _MSC_VER
# include <wtypes.h>
More information about the vlc-commits
mailing list