Commit b6d3e2ba authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

include: Do not import strmif.idl in mediaobj.idl.

This means that mfobjects.idl no longer pulls in mediaobj.idl. Since it still needs AM_MEDIA_TYPE to be declared (though not defined), add a typedef. Reorder includes in a couple files to avoid multiple-definition errors. strmiids and mfplat were getting strmif.h through mfobjects.h, and dsdmo was getting it through dmo.h.
parent 8d61e931
......@@ -21,6 +21,7 @@
#include "mmreg.h"
#include "mmsystem.h"
#include "uuids.h"
#include "strmif.h"
#include "initguid.h"
#include "medparam.h"
#include "dsound.h"
......
......@@ -22,6 +22,7 @@
#include "dxva2api.h"
#include "uuids.h"
#include "strmif.h"
#include "initguid.h"
#include "ks.h"
#include "ksmedia.h"
......
......@@ -19,8 +19,10 @@
import "unknwn.idl";
import "objidl.idl";
import "strmif.idl";
cpp_quote("#ifdef __strmif_h__")
cpp_quote("typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE;")
cpp_quote("#else")
typedef struct _DMOMediaType
{
GUID majortype;
......@@ -34,6 +36,9 @@ typedef struct _DMOMediaType
BYTE *pbFormat;
} DMO_MEDIA_TYPE;
typedef LONGLONG REFERENCE_TIME;
cpp_quote("#endif")
/*****************************************************************************
* IEnumDMO interface
*/
......
......@@ -507,6 +507,7 @@ typedef enum
struct tagVIDEOINFOHEADER;
typedef struct tagVIDEOINFOHEADER VIDEOINFOHEADER;
typedef struct _AMMediaType AM_MEDIA_TYPE;
HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key);
HRESULT WINAPI MFAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue);
......
......@@ -16,9 +16,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* Don't define those GUIDs here */
/* strmiids needs guids from evr.idl, but not the rest of the MF guids.
* We also need to avoid redefining the rest of the DirectShow guids from
* strmif.h. */
#include "propidl.h"
#include "mfidl.h"
#include "strmif.h"
#include "initguid.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