mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

Move AM_MEDIA_TYPE structure definition to mediatype.h.

Browse Source 
Make inclusion of com.h and wine/*.h conditional,
this will allow reusing of mediatype.c code under MinGW
without requirement to include all remaining wine/* stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24448 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
voroshil 2007-09-13 16:13:37 +00:00
parent 429b15b71b
commit 4357e135eb
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
loader/dshow/guids.h
View File

@ -1,26 +1,26 @@
#ifndef DS_GUIDS_H
#define DS_GUIDS_H
/*
this will be defined if <ole2.h> already included before this file
under MinGW
*/
#ifndef GUID_DEFINED
#include "com.h"
#endif
#ifndef VFWAPI
#include "wine/module.h"
#include "wine/windef.h"
#include "wine/vfw.h"
#endif
#include "mediatype.h"
//#define Debug if(1)
#define Debug if(0)
typedef struct __attribute__((__packed__)) _MediaType
{
GUID majortype; //0x0
GUID subtype; //0x10
int bFixedSizeSamples; //0x20
int bTemporalCompression; //0x24
unsigned long lSampleSize; //0x28
GUID formattype; //0x2c
IUnknown* pUnk; //0x3c
unsigned long cbFormat; //0x40
char* pbFormat; //0x44
} AM_MEDIA_TYPE;
typedef long long REFERENCE_TIME;

2
loader/dshow/mediatype.c
View File

@ -20,10 +20,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include "mediatype.h"
#include "mp_msg.h"
#include "wine/winerror.h"
#include "com.h"
#include "mediatype.h"
#include "libwin32.h"
void DisplayMediaType(const char * label,const AM_MEDIA_TYPE* pmt){

13
loader/dshow/mediatype.h
View File

@ -7,6 +7,19 @@
#define DS_MEDIATYPE_H
#include "guids.h"
typedef struct __attribute__((__packed__)) _MediaType
{
GUID majortype; //0x0
GUID subtype; //0x10
int bFixedSizeSamples; //0x20
int bTemporalCompression; //0x24
unsigned long lSampleSize; //0x28
GUID formattype; //0x2c
IUnknown* pUnk; //0x3c
unsigned long cbFormat; //0x40
char* pbFormat; //0x44
} AM_MEDIA_TYPE;
/**
* \brief print info from AM_MEDIA_TYPE structure
* =param[in] label short lable for media type