Commit 8d10ff29 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

DShow: cleaning and cosmetics

parent a147691f
/*****************************************************************************
* 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
......
......@@ -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>
......
......@@ -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;
......
/*****************************************************************************
* 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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment